From 0317c498ce8ca91852e7f1c7c2ec9abc49c87168 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Mon, 2 Oct 2017 17:55:23 -0400 Subject: [PATCH] Cleanuop to squash Signed-off-by: Jonathan Rajotte --- lttng_b_test/.cache/v/cache/lastfailed | 82 ------ lttng_b_test/__init__.py | 0 .../__pycache__/__init__.cpython-35.pyc | Bin 140 -> 0 bytes .../__pycache__/settings.cpython-35.pyc | Bin 172 -> 0 bytes lttng_b_test/config.yaml | 24 -- lttng_b_test/config.yaml.backup | 63 ----- lttng_b_test/debug.log | 18 -- ...3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace | 1 - ...3A%2F%2Fgithub.com%2Flttng%2Flttng-modules | 1 - ...s%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools | 1 - ...tps%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust | 1 - lttng_b_test/launch.py | 136 ---------- lttng_b_test/run_configuration.yaml | 30 --- lttng_b_test/settings.py | 2 - lttng_b_test/tests/.cache/v/cache/lastfailed | 5 - lttng_b_test/tests/__init__.py | 0 .../tests/__pycache__/__init__.cpython-35.pyc | Bin 139 -> 0 bytes .../test_base.cpython-35-PYTEST.pyc | Bin 3127 -> 0 bytes .../.cache/v/cache/lastfailed | 3 - .../tests/ust_soname_vs_tools/__init__.py | 0 .../__pycache__/__init__.cpython-35.pyc | Bin 159 -> 0 bytes .../test_base.cpython-35-PYTEST.pyc | Bin 3166 -> 0 bytes ...ust_so_name_vs_tools.cpython-35-PYTEST.pyc | Bin 2567 -> 0 bytes .../test_ust_so_name_vs_tools.py | 122 --------- .../tmpdir/jedihttp_48909_stderr_HaRUyb.log | 0 .../tmpdir/jedihttp_48909_stdout_iH8gLc.log | 0 .../tmpdir/ycmd_56995_stderr_wm39h3vf.log | 24 -- .../tmpdir/ycmd_56995_stdout_zy78ixo5.log | 1 - lttng_b_test/utils/.ProjectFactory.py.swp | Bin 12288 -> 0 bytes lttng_b_test/utils/.project.py.swp | Bin 24576 -> 0 bytes lttng_b_test/utils/ProjectFactory.py | 33 --- .../__pycache__/ProjectFactory.cpython-35.pyc | Bin 1000 -> 0 bytes .../utils/__pycache__/project.cpython-35.pyc | Bin 7171 -> 0 bytes .../utils/__pycache__/skip.cpython-35.pyc | Bin 272 -> 0 bytes lttng_b_test/utils/project.py | 235 ------------------ lttng_b_test/utils/skip.py | 4 - 36 files changed, 786 deletions(-) delete mode 100644 lttng_b_test/.cache/v/cache/lastfailed delete mode 100644 lttng_b_test/__init__.py delete mode 100644 lttng_b_test/__pycache__/__init__.cpython-35.pyc delete mode 100644 lttng_b_test/__pycache__/settings.cpython-35.pyc delete mode 100644 lttng_b_test/config.yaml delete mode 100644 lttng_b_test/config.yaml.backup delete mode 100644 lttng_b_test/debug.log delete mode 160000 lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace delete mode 160000 lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-modules delete mode 160000 lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools delete mode 160000 lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust delete mode 100644 lttng_b_test/launch.py delete mode 100644 lttng_b_test/run_configuration.yaml delete mode 100644 lttng_b_test/settings.py delete mode 100644 lttng_b_test/tests/.cache/v/cache/lastfailed delete mode 100644 lttng_b_test/tests/__init__.py delete mode 100644 lttng_b_test/tests/__pycache__/__init__.cpython-35.pyc delete mode 100644 lttng_b_test/tests/__pycache__/test_base.cpython-35-PYTEST.pyc delete mode 100644 lttng_b_test/tests/ust_soname_vs_tools/.cache/v/cache/lastfailed delete mode 100644 lttng_b_test/tests/ust_soname_vs_tools/__init__.py delete mode 100644 lttng_b_test/tests/ust_soname_vs_tools/__pycache__/__init__.cpython-35.pyc delete mode 100644 lttng_b_test/tests/ust_soname_vs_tools/__pycache__/test_base.cpython-35-PYTEST.pyc delete mode 100644 lttng_b_test/tests/ust_soname_vs_tools/__pycache__/test_ust_so_name_vs_tools.cpython-35-PYTEST.pyc delete mode 100644 lttng_b_test/tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py delete mode 100644 lttng_b_test/tmpdir/jedihttp_48909_stderr_HaRUyb.log delete mode 100644 lttng_b_test/tmpdir/jedihttp_48909_stdout_iH8gLc.log delete mode 100644 lttng_b_test/tmpdir/ycmd_56995_stderr_wm39h3vf.log delete mode 100644 lttng_b_test/tmpdir/ycmd_56995_stdout_zy78ixo5.log delete mode 100644 lttng_b_test/utils/.ProjectFactory.py.swp delete mode 100644 lttng_b_test/utils/.project.py.swp delete mode 100644 lttng_b_test/utils/ProjectFactory.py delete mode 100644 lttng_b_test/utils/__pycache__/ProjectFactory.cpython-35.pyc delete mode 100644 lttng_b_test/utils/__pycache__/project.cpython-35.pyc delete mode 100644 lttng_b_test/utils/__pycache__/skip.cpython-35.pyc delete mode 100644 lttng_b_test/utils/project.py delete mode 100644 lttng_b_test/utils/skip.py diff --git a/lttng_b_test/.cache/v/cache/lastfailed b/lttng_b_test/.cache/v/cache/lastfailed deleted file mode 100644 index 8f04219..0000000 --- a/lttng_b_test/.cache/v/cache/lastfailed +++ /dev/null @@ -1,82 +0,0 @@ -{ - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/bindings/python/babeltrace/examples/sequence_test.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_clock_class.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_clock_class_priority_map.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_component.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_component_class.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_connection.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_ctf_writer_clock.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_event.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_event_class.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_field_types.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_fields.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_graph.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_notification.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_notification_iterator.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_packet.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_plugin.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_port.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_query_executor.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_stream.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_stream_class.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_trace.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/bindings/python/bt2/test_values.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/cli/intersection/test_multi_trace_intersection.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace/tests/python-plugin-provider/test_python_plugin_provider.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools/tests/regression/ust/baddr-statedump/test_baddr-statedump.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools/tests/regression/ust/daemon/test_daemon.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools/tests/regression/ust/exit-fast/test_exit-fast.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools/tests/regression/ust/fork/test_fork.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools/tests/regression/ust/libc-wrapper/test_libc-wrapper.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools/tests/regression/ust/linking/test_linking.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools/tests/regression/ust/type-declarations/test_type_declarations.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools/tests/regression/ust/ust-dl/test_ust-dl.py": true, - "git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools/tests/utils/test_utils.py": true, - "test/ust_soname_vs_tools/test_base.py::test_timedistance_v0[a2-b2-expected2]": true, - "test/ust_soname_vs_tools/test_base.py::test_timedistance_v1[test3]": true, - "test/ust_soname_vs_tools/test_base.py::test_timedistance_v2[20011212-20011211-expected2]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.10-lttng-tools-2.10-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.10-lttng-tools-2.7-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.10-lttng-tools-2.8-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.10-lttng-tools-2.9-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.8-lttng-tools-2.10-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.8-lttng-tools-2.7-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.8-lttng-tools-2.8-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.8-lttng-tools-2.9-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.9-lttng-tools-2.10-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.9-lttng-tools-2.7-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.9-lttng-tools-2.8-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_configure[lttng-ust-2.9-lttng-tools-2.9-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname[lttng-ust-2.10-lttng-tools-2.7-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname[lttng-ust-2.7-lttng-tools-2.8-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.10-lttng-tools-2.10-lttng-ust-2.10-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.10-lttng-tools-2.7-lttng-ust-2.7-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.10-lttng-tools-2.8-lttng-ust-2.8-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.10-lttng-tools-2.9-lttng-ust-2.9-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.7-lttng-tools-2.10-lttng-ust-2.10-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.7-lttng-tools-2.9-lttng-ust-2.9-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.8-lttng-tools-2.10-lttng-ust-2.10-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.8-lttng-tools-2.7-lttng-ust-2.7-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.8-lttng-tools-2.8-lttng-ust-2.8-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.8-lttng-tools-2.9-lttng-ust-2.9-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.9-lttng-tools-2.10-lttng-ust-2.10-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.9-lttng-tools-2.7-lttng-ust-2.7-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.9-lttng-tools-2.8-lttng-ust-2.8-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_build[lttng-ust-2.9-lttng-tools-2.9-lttng-ust-2.9-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.10-lttng-tools-2.10-lttng-ust-2.10-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.10-lttng-tools-2.7-lttng-ust-2.7-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.10-lttng-tools-2.8-lttng-ust-2.8-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.10-lttng-tools-2.9-lttng-ust-2.9-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.7-lttng-tools-2.10-lttng-ust-2.10-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.7-lttng-tools-2.7-lttng-ust-2.7-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.7-lttng-tools-2.8-lttng-ust-2.8-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.7-lttng-tools-2.9-lttng-ust-2.9-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.8-lttng-tools-2.10-lttng-ust-2.10-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.8-lttng-tools-2.7-lttng-ust-2.7-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.8-lttng-tools-2.8-lttng-ust-2.8-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.8-lttng-tools-2.9-lttng-ust-2.9-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.9-lttng-tools-2.10-lttng-ust-2.10-False]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.9-lttng-tools-2.7-lttng-ust-2.7-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.9-lttng-tools-2.8-lttng-ust-2.8-True]": true, - "tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py::test_soname_configure[lttng-ust-2.9-lttng-tools-2.9-lttng-ust-2.9-True]": true -} \ No newline at end of file diff --git a/lttng_b_test/__init__.py b/lttng_b_test/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/lttng_b_test/__pycache__/__init__.cpython-35.pyc b/lttng_b_test/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index c309682757e6c1658a944feaac329c2c55b3477f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmWgV<>k_?UmD2(1dl-k3@`#24nSPY0whux7=kq!{Z=v*frJsnFH8N5{M=Oito*#h zl8nSW{hX4LymSazrdyI)TmoUoC&hy~@$s2?nI-Y@dIgoYIBatBQ%ZAE?LbBr12F>t Dqtzl- diff --git a/lttng_b_test/__pycache__/settings.cpython-35.pyc b/lttng_b_test/__pycache__/settings.cpython-35.pyc deleted file mode 100644 index 2d0c19898c9b405550605f852c32badad547489a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmWgV<>flJ{!*kh0|UcjAcg}*Aj<)Wi+O=W3Ijt1BSRFB!N?G-$yCLgQ&N(bu3K7M zqHCmQ?x)Fki?bxPxFkM5FQ;-PLlF~D3z+z2sh^Rbo2s9cpO;vYk(j3s)(0WWbU|7m l?D(X3FsC@Rq$D#hy;!fH@)n0pZhlH>PO2Tqv|=D;004UKE`0z1 diff --git a/lttng_b_test/config.yaml b/lttng_b_test/config.yaml deleted file mode 100644 index bc0281b..0000000 --- a/lttng_b_test/config.yaml +++ /dev/null @@ -1,24 +0,0 @@ -lttng-tools: - - marker: lttng-tools-2.7 - url: https://github.com/lttng/lttng-tools - ref: stable-2.7 - - marker: lttng-tools-2.8 - url: https://github.com/lttng/lttng-tools - ref: stable-2.8 -lttng-ust: - - marker: lttng-ust-2.7 - url: https://github.com/lttng/lttng-ust - ref: stable-2.7 - - marker: lttng-ust-2.10 - url: https://github.com/lttng/lttng-ust - ref: stable-2.7 - -lttng-modules: - - marker: lttng-modules-2.7 - url: https://github.com/lttng/lttng-modules - ref: stable-2.7 - -babeltrace: - - marker: babeltrace-master - url: https://github.com/efficios/babeltrace - ref: master diff --git a/lttng_b_test/config.yaml.backup b/lttng_b_test/config.yaml.backup deleted file mode 100644 index e81f6e5..0000000 --- a/lttng_b_test/config.yaml.backup +++ /dev/null @@ -1,63 +0,0 @@ -lttng-tools: - - marker: lttng-tools-2.7 - url: https://github.com/lttng/lttng-tools - ref: stable-2.7 - - marker: lttng-tools-2.8 - url: https://github.com/lttng/lttng-tools - ref: stable-2.8 - - marker: lttng-tools-2.9 - url: https://github.com/lttng/lttng-tools - ref: stable-2.9 - - marker: lttng-tools-2.10 - url: https://github.com/lttng/lttng-tools - ref: stable-2.10 - - marker: lttng-tools-master - url: https://github.com/lttng/lttng-tools - ref: stable-2.10 -lttng-ust: - - marker: lttng-ust-2.7 - url: https://github.com/lttng/lttng-ust - ref: stable-2.7 - - marker: lttng-ust-2.8 - url: https://github.com/lttng/lttng-ust - ref: stable-2.8 - - marker: lttng-ust-2.9 - url: https://github.com/lttng/lttng-ust - ref: stable-2.9 - - marker: lttng-ust-2.10 - url: https://github.com/lttng/lttng-ust - ref: stable-2.10 - - marker: lttng-ust-master - url: https://github.com/lttng/lttng-ust - ref: stable-2.10 - -lttng-modules: - - marker: lttng-modules-2.7 - url: https://github.com/lttng/lttng-modules - ref: stable-2.7 - - marker: lttng-modules-2.8 - url: https://github.com/lttng/lttng-modules - ref: stable-2.8 - - marker: lttng-modules-2.9 - url: https://github.com/lttng/lttng-modules - ref: stable-2.9 - - marker: lttng-modules-2.10 - url: https://github.com/lttng/lttng-modules - ref: stable-2.10 - - marker: lttng-modules-master - url: https://github.com/lttng/lttng-modules - ref: stable-2.10 - -babeltrace: - - marker: babeltrace-1.3 - url: https://github.com/efficios/babeltrace - ref: stable-1.3 - - marker: babeltrace-1.4 - url: https://github.com/efficios/babeltrace - ref: stable-1.4 - - marker: babeltrace-1.5 - url: https://github.com/efficios/babeltrace - ref: stable-1.5 - - marker: babeltrace-master - url: https://github.com/efficios/babeltrace - ref: master diff --git a/lttng_b_test/debug.log b/lttng_b_test/debug.log deleted file mode 100644 index 17b9d59..0000000 --- a/lttng_b_test/debug.log +++ /dev/null @@ -1,18 +0,0 @@ -09-29 17:18 setup.git INFO Remotes to be fetched {'https://github.com/lttng/lttng-ust': '/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust', 'https://github.com/lttng/lttng-tools': '/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools', 'https://github.com/efficios/babeltrace': '/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace', 'https://github.com/lttng/lttng-modules': '/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-modules'} -09-29 17:18 git.cmd DEBUG Popen(['git', 'fetch', '-v', 'origin'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust, universal_newlines=True, shell=None) -09-29 17:18 git.cmd DEBUG Popen(['git', 'fetch', '-v', 'origin'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools, universal_newlines=True, shell=None) -09-29 17:18 git.cmd DEBUG Popen(['git', 'fetch', '-v', 'origin'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace, universal_newlines=True, shell=None) -09-29 17:18 git.cmd DEBUG Popen(['git', 'fetch', '-v', 'origin'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-modules, universal_newlines=True, shell=None) -09-29 17:18 git.cmd DEBUG Popen(['git', 'cat-file', '--batch-check'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-modules, universal_newlines=False, shell=None) -09-29 17:18 git.cmd DEBUG Popen(['git', 'cat-file', '--batch-check'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace, universal_newlines=False, shell=None) -09-29 17:18 setup.git INFO Marker:babeltrace-master Sha1 9d69da48590e1b1833c5a80eb6f7b6928550569d -09-29 17:18 git.cmd DEBUG Popen(['git', 'cat-file', '--batch-check'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools, universal_newlines=False, shell=None) -09-29 17:18 setup.git INFO Marker:lttng-tools-2.7 Sha1 e47357fe8006f4ff13bae0fa6cef31da2466e97e -09-29 17:18 git.cmd DEBUG Popen(['git', 'cat-file', '--batch-check'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools, universal_newlines=False, shell=None) -09-29 17:18 setup.git INFO Marker:lttng-tools-2.8 Sha1 73d0ff3ee853e4933641b7cc02c7c5a1bc3183cf -09-29 17:18 git.cmd DEBUG Popen(['git', 'cat-file', '--batch-check'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust, universal_newlines=False, shell=None) -09-29 17:18 setup.git INFO Marker:lttng-ust-2.7 Sha1 6b649e4894d06e63c9835728772198c7ffb206b3 -09-29 17:18 git.cmd DEBUG Popen(['git', 'cat-file', '--batch-check'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust, universal_newlines=False, shell=None) -09-29 17:18 setup.git INFO Marker:lttng-ust-2.10 Sha1 6b649e4894d06e63c9835728772198c7ffb206b3 -09-29 17:18 git.cmd DEBUG Popen(['git', 'cat-file', '--batch-check'], cwd=/home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-modules, universal_newlines=False, shell=None) -09-29 17:18 setup.git INFO Marker:lttng-modules-2.7 Sha1 1b027915cd28cf3e211e4116f928c75f196a1390 diff --git a/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace b/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace deleted file mode 160000 index 6470c17..0000000 --- a/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6470c171fb12d6c5d53773c6e5d9765ed5a54426 diff --git a/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-modules b/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-modules deleted file mode 160000 index cf10111..0000000 --- a/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-modules +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf101116238c2e18f6bf927822dbe47aa4e71dec diff --git a/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools b/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools deleted file mode 160000 index 5a63877..0000000 --- a/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5a63877f8e9d4a33edeff874d42e5bd5ef082299 diff --git a/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust b/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust deleted file mode 160000 index d0f6cf5..0000000 --- a/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d0f6cf574ef992620b09c183cb3a0ea771070ea5 diff --git a/lttng_b_test/launch.py b/lttng_b_test/launch.py deleted file mode 100644 index fcbde6e..0000000 --- a/lttng_b_test/launch.py +++ /dev/null @@ -1,136 +0,0 @@ -import pytest -import os -import yaml -import logging -import urllib.parse - -from git import Repo - -default_git_remote_dir = "./git_remote" - - -def is_ref_branch(repo, ref): - try: - repo.remote().refs[ref] - is_branch = True - except: - is_branch = False - - return is_branch - - -def is_ref_tag(repo, ref): - try: - repo.tags[ref] - is_tag = True - except: - is_tag = False - - return is_tag - - -def is_ref_commit(repo, ref): - try: - Repo.rev_parse(repo, ref) - is_commit = True - except: - is_commit = False - - return is_commit - - -def logging_setup(): - logger_format = '%(asctime)s %(name)-12s %(levelname)-8s %(message)s' - logging.basicConfig(level=logging.DEBUG, - format=logger_format, - datefmt='%m-%d %H:%M', - filename='./debug.log', - filemode='w') - # define a Handler which writes INFO messages or higher to the sys.stderr - console = logging.StreamHandler() - console.setLevel(logging.DEBUG) - # set a format which is simpler for console use - formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s') - # tell the handler to use this format - console.setFormatter(formatter) - # add the handler to the root logger - logging.getLogger('').addHandler(console) - - -logging_setup() - -# Remote setup -logger_git = logging.getLogger('setup.git') - -# Fetch local base repository -with open("config.yaml", 'r') as stream: - config = yaml.load(stream) - -# Retrieve all possibles remotes and clean url for path -remotes = {} -for project, markers in config.items(): - if markers is None: - continue - for marker in markers: - url = marker['url'] - url2path = urllib.parse.quote_plus(url) - path = os.path.abspath(default_git_remote_dir + '/' + url2path) - remotes[url] = path - -logger_git.info('Remotes to be fetched {}'.format(remotes)) - -if not os.path.isdir(default_git_remote_dir): - os.mkdir(default_git_remote_dir) - -# Fetch the remote -for url, path in remotes.items(): - if os.path.exists(path): - if not os.path.isdir(path): - logger_git.error('Remote path {} exists and is not a folder'.format(path)) - exit() - repo = Repo(path) - else: - repo = Repo.clone_from(url, path) - - # TODO: might be necessary to actually update the base branch, to validate - repo.remote().fetch() - -# Create marker definition for test runners -runnable_markers = {} -for project, markers in config.items(): - if markers is None: - continue - for marker in markers: - name = marker['marker'] - ref = marker['ref'] - url = marker['url'] - path = remotes[url] - repo = Repo(path) - - git_object = None - if is_ref_branch(repo, ref): - git_object = Repo.rev_parse(repo, repo.remote().refs[ref].name) - elif is_ref_tag(repo, ref): - git_object = repo.tags[ref].commit - elif is_ref_commit(repo, ref): - git_object = repo.commit(ref) - - if git_object is None: - logger_git.error('Invalid git reference for marker "{}"'.format(name)) - exit(1) - - logger_git.info('Marker:{: <30} Sha1 {: <20}'.format(name, git_object.hexsha)) - - if name in runnable_markers: - logger_git.error('Duplicate for entry for marker "{}"'.format(name)) - exit(1) - - runnable_markers[name] = { - 'project': project, - 'sha1': git_object.hexsha, - 'url': url, - 'path': path - } - -with open('run_configuration.yaml', 'w') as run_configuration: - yaml.dump(runnable_markers, run_configuration, default_flow_style=False) diff --git a/lttng_b_test/run_configuration.yaml b/lttng_b_test/run_configuration.yaml deleted file mode 100644 index 90ddc6c..0000000 --- a/lttng_b_test/run_configuration.yaml +++ /dev/null @@ -1,30 +0,0 @@ -babeltrace-master: - path: /home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Fefficios%2Fbabeltrace - project: babeltrace - sha1: 9d69da48590e1b1833c5a80eb6f7b6928550569d - url: https://github.com/efficios/babeltrace -lttng-modules-2.7: - path: /home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-modules - project: lttng-modules - sha1: 1b027915cd28cf3e211e4116f928c75f196a1390 - url: https://github.com/lttng/lttng-modules -lttng-tools-2.7: - path: /home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools - project: lttng-tools - sha1: e47357fe8006f4ff13bae0fa6cef31da2466e97e - url: https://github.com/lttng/lttng-tools -lttng-tools-2.8: - path: /home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-tools - project: lttng-tools - sha1: 73d0ff3ee853e4933641b7cc02c7c5a1bc3183cf - url: https://github.com/lttng/lttng-tools -lttng-ust-2.10: - path: /home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust - project: lttng-ust - sha1: 6b649e4894d06e63c9835728772198c7ffb206b3 - url: https://github.com/lttng/lttng-ust -lttng-ust-2.7: - path: /home/jonathan/lttng/lttngv-test/lttng_b_test/git_remote/https%3A%2F%2Fgithub.com%2Flttng%2Flttng-ust - project: lttng-ust - sha1: 6b649e4894d06e63c9835728772198c7ffb206b3 - url: https://github.com/lttng/lttng-ust diff --git a/lttng_b_test/settings.py b/lttng_b_test/settings.py deleted file mode 100644 index d005bd4..0000000 --- a/lttng_b_test/settings.py +++ /dev/null @@ -1,2 +0,0 @@ -# All tests are run if empty -test_only = {"lttng-ust-2.7"} diff --git a/lttng_b_test/tests/.cache/v/cache/lastfailed b/lttng_b_test/tests/.cache/v/cache/lastfailed deleted file mode 100644 index 62c670c..0000000 --- a/lttng_b_test/tests/.cache/v/cache/lastfailed +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test_base.py::test_timedistance_v0[a2-b2-expected2]": true, - "test_base.py::test_timedistance_v1[test3]": true, - "test_base.py::test_timedistance_v2[20011212-20011211-expected2]": true -} \ No newline at end of file diff --git a/lttng_b_test/tests/__init__.py b/lttng_b_test/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/lttng_b_test/tests/__pycache__/__init__.cpython-35.pyc b/lttng_b_test/tests/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index d8ac39ad8c4f3b09da7dea41b65baee7b592b3a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmWgV<>mTXzci8o2p)q77+?f49Dul(1xTbYFa&Ed`mJOr0tq9CUl#fq`MIh3S^0U1 zB^il%`Z*;fdFc?cOt&PpxCF}92eaejGxIV_;^XxSDsOSv}+0pp{Ux!q8hcjTiv6c>2JEVI5kx+oc{KzQULf1 zZd@hgU*fGs3_##ukN^a1!duX_q3b|U0AYc!A#tHsgrEp)Z0$kd8EXfU67)(CAT2{s z1{Re-pr1=)Xv1rstQpWSw|VmtPLfvPfkimwF~_^CSsnG?4AIH{deTReT+`j^iYY z`%1e>iWW*YLv@%QC&HM92T9uEN!aI<(opeEL^J5x*CvKI?SCs}D)nsGNo9{`A;y{T zKF{!tU(}3i){->}iSn;2^u;{@h`xXLLP~WDy zL>E1&AekaW;o>32I+S6b!9#4(M^NlyT{LHU-<)M@@7!H^wbEM=zOBo#!V_g+CmozX zdn%J1LL-(+`-CTVgLPuj>C^HQnFDKB(#PljsJmMj|1IiPaX00sNZtbKwyC~6RCm@; zudVpqZGZoHaapG{Z@ir}?>xIsbMaPj*+l*5Z@lCdMK-6sNzXN9PcMaemtM~sBX-Vp z8J)^F!;X8c(#5gP6wRP~oW+S+S4Z(cQmxW%K8Gnc693WhpPCvM{*H0&^te3I73}%g z#WNY7N2cXTs(Pl*NQ1N4uI_hl~?$4T@R6-f0Fk}5QyZdI)XdzG!S UP3MW*WKFl~J}*?+Q`W%yAEg3j&;S4c diff --git a/lttng_b_test/tests/ust_soname_vs_tools/.cache/v/cache/lastfailed b/lttng_b_test/tests/ust_soname_vs_tools/.cache/v/cache/lastfailed deleted file mode 100644 index 3fa2028..0000000 --- a/lttng_b_test/tests/ust_soname_vs_tools/.cache/v/cache/lastfailed +++ /dev/null @@ -1,3 +0,0 @@ -{ - "test_base.py": true -} \ No newline at end of file diff --git a/lttng_b_test/tests/ust_soname_vs_tools/__init__.py b/lttng_b_test/tests/ust_soname_vs_tools/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/lttng_b_test/tests/ust_soname_vs_tools/__pycache__/__init__.cpython-35.pyc b/lttng_b_test/tests/ust_soname_vs_tools/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index fcf101fa03ef1cf6b63547493784659b742574f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmWgV<>iuYJQc|R1dl-k3@`#24nSPY0whux7=kq!{Z=v*frJsnFCYDk{M=Oito*#h zl8nSW{hX4LymSazrdyI)Tmoh5gW09UCGo{TrMao`WySF&`T04;`tk9Zd6^~g@p=W7 Uw>WHa^HWN5Qtd#t6az5>0NEKTNB{r; diff --git a/lttng_b_test/tests/ust_soname_vs_tools/__pycache__/test_base.cpython-35-PYTEST.pyc b/lttng_b_test/tests/ust_soname_vs_tools/__pycache__/test_base.cpython-35-PYTEST.pyc deleted file mode 100644 index dd42dcdcce1b48ba8dac1301c4bda1c57e964f98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3166 zcmeHJOLOBy5blv|S$@QEoR_o9BMTcqAvnoqxe;n9ifb-8tq!PUkDSPnEZ58=OH#>Y z%^#qOf53?&e}fwwr?_$QU&sZzM|L)^y--`VheaiQ(>>}Q^~`+Jt>u}S%5N`!f4)=% z_#3WWWt5-cBgYJYM@B(mjEyBo#SE^&w3h)w)81(MGy5)$LD|akkH>NwWJg~v9LgYff2K^b}Wr(UU zvVh}gRrnFe%&*@z;5FcATn9c2IKs$cya9Y}YCj9S34ESZzj2Rm)G#g!z!#@3b2rT} zp60csc-<__%J3x$W@Iy(#dWWI0q?HT1DX_h)yeC?GV@&q-kJt8PdmKtJscAU_B^Hw zBFmI#X_tp8QgIsTG9ix=6~=#*0LC@699IdDA~3cP&T8RCXCwMy70#y?&W`8I`;oh%H#UKu_HHGMpD7W~k#Zcw>wu zILFmybiXvm0%w5K-}h$rF0I|&%jVi=!_zHKuI}!xlK8}v+Qvq^)Ab>BOBZuI>G zhf+pD8QZ71?Ng5lI*8a*un`TCU0r!LJXMiYK`8WG&<&F$5YbR{vve4WNZ0Un&^eA1 z6%V9#k_;`RZUyo%J5IPU4Gxm56DGkRqvX zX0DjS&R5L+nCu=?mn)hi&l4;VED|gcEEBW{RuH_BctG+)f-9Pd_eg!8-~$38Qx2;r z-OGS&`b^FM`vwEnu)j-bi!N#@Rhjfe;o|Ye45hFF;qkWUBdGSVLYULOZ%(yfT)L55wy=Nv4_;!MB3sbz zv>KbVr&of!ez)_Ii8Zw?q8B1oSc|W^bZOFOlBU0Gs^p|5wvSbu$hJI+hk|~)w382L za*v>l;=5GE@YgNWg)|gLx{ALBSUr`9&mvR*1f@WebcCU0(HIDd{aUgzId&EMwEI<> p@#7@=nzE(*2%!c|XjnCC$zEscY^(6dX|a}5b3QHB*kjhj=U*4@cYOc= diff --git a/lttng_b_test/tests/ust_soname_vs_tools/__pycache__/test_ust_so_name_vs_tools.cpython-35-PYTEST.pyc b/lttng_b_test/tests/ust_soname_vs_tools/__pycache__/test_ust_so_name_vs_tools.cpython-35-PYTEST.pyc deleted file mode 100644 index 5939cfa8c843c0bca89372d77346f3800b4fdc85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2567 zcmbtVOK;mo5FSzzt@q1T9Oo&gheAbSCq;oKKoBHN>ONouPHZ3zfr6m48<{divb!rc zHk4C(?|&%JLxBM8UulnfEqcgb@ToIPi;>*4mrB~v%(t`OzCI3DYqj$4zy9&uUIzFR z<~|t1eQffs1;FrUK?vYlGv9_$4n}!!3p2z4*O~cCFe<{R1a4`Dlwni>w>k@J;MRb( zfh_}D0oDO_4%jNN^T5`CT>y3w*d<_>fn5Q16<8P8It-iO)?tXtXaKLms0s3C;B^Y4 zC-Cwy`H#Nc0=EUcMKi6@UlrDDw+-$x@b>Aj0|(?^z!5Pl7>YN*8!%d-fv+vFzIy}D zxC5gOjBsH!>U?bjs{?Dm4?rpID!eD539L0sz`akVQcWl+hE$Kepi2641D+VR(ku z{^aR5ss_^~lOL7mda-l2mw$X*%FgAuGIwalAJJBWXxJUZ(TiX>5xm=MUE1i={=)(Ab1wxnniHiG^AY{6V=gA|+qd~x> zcKn1Q?IcHvOQj1hiCa6u4J_!4 z#)+9TyIozGyI$S?=l$x++y(0#4%7uRL>D;C^9zV|yxS~jEytKnx=-Eh)bjS3b4#_t7HOXuR4cP0}x?Q%L zwqw_&8;-ldWlH^6`52f3Y2_FQ0=<(>#JM=~1_d_n-3MGXs%~?(ZFAVy^7e`ox z)V^pFA*n%h$ecr?3+4e6=h5$##2Voj$Xq0IiOgj(SIAsN expect success - False -> expect failure -""" - -test_matrix_label = [ - ("lttng-ust-2.7", "lttng-tools-2.7", "lttng-ust-2.7", True), - ("lttng-ust-2.7", "lttng-tools-2.8", "lttng-ust-2.8", False), - ("lttng-ust-2.7", "lttng-tools-2.9", "lttng-ust-2.9", False), - ("lttng-ust-2.7", "lttng-tools-2.10", "lttng-ust-2.10", False), - ("lttng-ust-2.8", "lttng-tools-2.7", "lttng-ust-2.7", True), - ("lttng-ust-2.8", "lttng-tools-2.8", "lttng-ust-2.8", True), - ("lttng-ust-2.8", "lttng-tools-2.9", "lttng-ust-2.9", False), - ("lttng-ust-2.8", "lttng-tools-2.10", "lttng-ust-2.10", False), - ("lttng-ust-2.9", "lttng-tools-2.7", "lttng-ust-2.7", True), - ("lttng-ust-2.9", "lttng-tools-2.8", "lttng-ust-2.8", True), - ("lttng-ust-2.9", "lttng-tools-2.9", "lttng-ust-2.9", True), - ("lttng-ust-2.9", "lttng-tools-2.10", "lttng-ust-2.10", False), - ("lttng-ust-2.10", "lttng-tools-2.7", "lttng-ust-2.7", False), - ("lttng-ust-2.10", "lttng-tools-2.8", "lttng-ust-2.8", False), - ("lttng-ust-2.10", "lttng-tools-2.9", "lttng-ust-2.9", False), - ("lttng-ust-2.10", "lttng-tools-2.10", "lttng-ust-2.10", True), -] - -runtime_matrix_label = [] -if not project_settings.test_only: - runtime_matrix_label = test_matrix_label -else: - for tup in test_matrix_label: - ust_label, tools_label = tup[0], tup[1] - if (ust_label in project_settings.test_only or tools_label in - project_settings.test_only): - runtime_matrix_label.append(tup) - - -@pytest.mark.parametrize("ust_label,tools_label,base_tools_ust_dep,should_pass", runtime_matrix_label) -def test_soname_configure(tmpdir, ust_label, tools_label, base_tools_ust_dep, should_pass): - ust = ProjectFactory.get(ust_label, str(tmpdir.mkdir("lttng-ust"))) - tools = ProjectFactory.get(tools_label, str(tmpdir.mkdir("lttng-tools"))) - - ust.autobuild() - - tools.dependencies.append(ust) - # TODO: Propose fixes to upstream regarding the check - if not should_pass: - # Making sure we get a error here - pytest.xfail("passing configure but should fail See todo") - with pytest.raises(subprocess.CalledProcessError) as error: - tools.configure() - print(error) - else: - # An exception is thrown on errors - # TODO MAYBE: wrap around a try and perform error printing + save - # stdout stderr etc. Or move all this handling inside the function and - # reraise the error (bubble up) - tools.configure() - - -@pytest.mark.parametrize("ust_label,tools_label,base_tools_ust_dep,should_pass", runtime_matrix_label) -def test_soname_build(tmpdir, ust_label, tools_label, base_tools_ust_dep, should_pass): - ust = ProjectFactory.get(ust_label, str(tmpdir.mkdir("lttng-ust"))) - tools = ProjectFactory.get(tools_label, str(tmpdir.mkdir("lttng-tools"))) - ust_configure_mockup = ProjectFactory.get(ust_label, str(tmpdir.mkdir("lttng-ust-base"))) - - ust.autobuild() - ust_configure_mockup.autobuild() - - # Fool configure - tools.dependencies.append(ust_configure_mockup) - tools.configure() - - # Use ust under test - tools.special_env_variables["CPPFLAGS"] = ust.get_cppflags() - tools.special_env_variables["LDFLAGS"] = ust.get_ldflags() - tools.special_env_variables["LD_LIBRARY_PATH"] = ust.get_ld_library_path() - - if not should_pass: - # Making sure we get a error here - with pytest.raises(subprocess.CalledProcessError) as error: - tools.build() - print(error) - else: - # An exception is thrown on errors - tools.build() diff --git a/lttng_b_test/tmpdir/jedihttp_48909_stderr_HaRUyb.log b/lttng_b_test/tmpdir/jedihttp_48909_stderr_HaRUyb.log deleted file mode 100644 index e69de29..0000000 diff --git a/lttng_b_test/tmpdir/jedihttp_48909_stdout_iH8gLc.log b/lttng_b_test/tmpdir/jedihttp_48909_stdout_iH8gLc.log deleted file mode 100644 index e69de29..0000000 diff --git a/lttng_b_test/tmpdir/ycmd_56995_stderr_wm39h3vf.log b/lttng_b_test/tmpdir/ycmd_56995_stderr_wm39h3vf.log deleted file mode 100644 index 1a6c98f..0000000 --- a/lttng_b_test/tmpdir/ycmd_56995_stderr_wm39h3vf.log +++ /dev/null @@ -1,24 +0,0 @@ -2017-10-02 16:05:45,117 - INFO - Received ready request -2017-10-02 16:05:45,142 - INFO - Received event notification -2017-10-02 16:05:45,145 - INFO - Starting JediHTTP server -2017-10-02 16:05:45,147 - INFO - using port 48909 -2017-10-02 16:05:45,148 - INFO - Received event notification -2017-10-02 16:05:45,148 - INFO - Adding buffer identifiers for file: /home/jonathan/lttng/lttngv-test/lttng_b_test/tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py -2017-10-02 16:05:45,250 - INFO - Received filetype completion available request -2017-10-02 16:15:45,129 - INFO - Starting new HTTP connection (1): 127.0.0.1 -2017-10-02 16:25:45,199 - INFO - Starting new HTTP connection (1): 127.0.0.1 -2017-10-02 16:26:14,801 - INFO - Received health request -2017-10-02 16:35:45,305 - INFO - Starting new HTTP connection (1): 127.0.0.1 -2017-10-02 16:36:14,905 - INFO - Received health request -2017-10-02 16:45:45,407 - INFO - Starting new HTTP connection (1): 127.0.0.1 -2017-10-02 16:46:15,015 - INFO - Received health request -2017-10-02 16:55:45,501 - INFO - Starting new HTTP connection (1): 127.0.0.1 -2017-10-02 16:56:15,119 - INFO - Received health request -2017-10-02 17:05:45,609 - INFO - Starting new HTTP connection (1): 127.0.0.1 -2017-10-02 17:06:15,226 - INFO - Received health request -2017-10-02 17:15:45,637 - INFO - Starting new HTTP connection (1): 127.0.0.1 -2017-10-02 17:16:15,335 - INFO - Received health request -2017-10-02 17:19:03,456 - INFO - Received event notification -2017-10-02 17:25:45,743 - INFO - Starting new HTTP connection (1): 127.0.0.1 -2017-10-02 17:35:45,826 - INFO - Starting new HTTP connection (1): 127.0.0.1 -2017-10-02 17:45:45,924 - INFO - Starting new HTTP connection (1): 127.0.0.1 diff --git a/lttng_b_test/tmpdir/ycmd_56995_stdout_zy78ixo5.log b/lttng_b_test/tmpdir/ycmd_56995_stdout_zy78ixo5.log deleted file mode 100644 index 00981de..0000000 --- a/lttng_b_test/tmpdir/ycmd_56995_stdout_zy78ixo5.log +++ /dev/null @@ -1 +0,0 @@ -serving on http://127.0.0.1:56995 diff --git a/lttng_b_test/utils/.ProjectFactory.py.swp b/lttng_b_test/utils/.ProjectFactory.py.swp deleted file mode 100644 index 95e72be3972adee794eb8b7e23a4f4ce6eeec9df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2J8#rL5XUD-R6GULFeF00h&zWzgHEDBfP@Gy2@og*vuE#J7VKSXcO3}Nj!!_v zSKv_~z6XL5Drjh^shPEX;YcEAXh37#KlaX!XJ>x9S4201Ls!q7!(;Iwplc_<;`0yJ zFKzw?dyWI#Hd^>4p~KYguF~1mWU_bpV(;3KqjjVW-5-ww&gI_gQS*1X=cV(_b23Qk zLFHBM<}O-uTc-ZBNWHNuak;W#P&P6FCh%thl^^zwZG)pn4%c7Mnd$wwd)JjezsDX- zfC(@GCcp%k025#WOn?deHw1h+1y87&O>IT{+xyg-dpqPC6JP>NfC(@GCcp%k025#W zOn?b60VePd5)c`H-vY2_Dw%~CrguNr}LKGaL#d;>ZF)1R;zXVx2PO<5B6=Li&)&A&#UU18*Vs>9~jY#syRDE27Bb+=#40heL{@DQ5=d zva~DcRUw%8zPMUh(LT%A`pkkOK=q54Z{hsG9^v~qA)(FU4Q z>Q302VKP*?>|$i2Srm>Ug|+)Ik=S{oCBUOP-;i@uH+=Uh=c7KheckbVXaY~j)?Mr8 zjmh0Q&)T}qw=h|i%k|!^eZqeb4uH2Jl@p;)tQxzp(fK3F58!9jG&C*_Cpe~quSFp{ zK)cveY06-JTwk|01qgjK>z>% diff --git a/lttng_b_test/utils/.project.py.swp b/lttng_b_test/utils/.project.py.swp deleted file mode 100644 index 71910d90d362a3975169e2c81c557f82552dfabe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 Pw()lX2Y)M-0xavlF$BcY diff --git a/lttng_b_test/utils/ProjectFactory.py b/lttng_b_test/utils/ProjectFactory.py deleted file mode 100644 index 97fe87e..0000000 --- a/lttng_b_test/utils/ProjectFactory.py +++ /dev/null @@ -1,33 +0,0 @@ -import os -import logging -import yaml - -import lttng_b_test.utils.project as Project - - -_logger = logging.getLogger('project.factory') -_conf_file = os.path.dirname(os.path.abspath(__file__)) + "/../run_configuration.yaml" -_project_constructor = { - 'babeltrace': Project.Babeltrace, - 'lttng-modules': Project.Lttng_modules, - 'lttng-tools': Project.Lttng_tools, - 'lttng-ust': Project.Lttng_ust, -} - -_markers = None -with open(_conf_file, 'r') as stream: - # This is voluntary static across call, no need to perform this - # every time. - _markers = yaml.load(stream) - - -def get(label, tmpdir): - if label not in _markers: - # TODO: specialized exception, handle it caller-side so the caller - # can decide to skip or fail test. - raise Exception('Label is no present') - marker = _markers[label] - constructor = _project_constructor[marker['project']] - path = marker['path'] - sha1 = marker['sha1'] - return constructor(label, path, sha1, tmpdir) diff --git a/lttng_b_test/utils/__pycache__/ProjectFactory.cpython-35.pyc b/lttng_b_test/utils/__pycache__/ProjectFactory.cpython-35.pyc deleted file mode 100644 index d22764cb398a613f1f7e7ee4a41d3bdf98820ed7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1000 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 DzJACq diff --git a/lttng_b_test/utils/__pycache__/skip.cpython-35.pyc b/lttng_b_test/utils/__pycache__/skip.cpython-35.pyc deleted file mode 100644 index 25fbb7f27bf7b9c910032fdc192965f25e3067e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmX|+Jx&8L5QU$2odu$#qM+S21-PO^5f^}litUVSlKrz+_82L&IR+=-N^Vne1uEfJ4%GcuJ2+K3i%P!vHkr%+N4shOR(YLIWMg{@C^R@08Or^rX?`dInCo!a+! zvC*VMt0K><-*8unceLMov9+TXoi&oS(uje`Z2tY@Hlt2i1ZoE_GVpHN#mk4$sxas^ MOC+D)U9d&*2dW!JKL7v# diff --git a/lttng_b_test/utils/project.py b/lttng_b_test/utils/project.py deleted file mode 100644 index fb8c5c8..0000000 --- a/lttng_b_test/utils/project.py +++ /dev/null @@ -1,235 +0,0 @@ -import os -import shutil -import git -import subprocess -import logging - - -class Project(object): - - def __init__(self, label, git_path, sha1, tmpdir): - self.label = label - self.git_path = git_path - self.sha1 = sha1 - - """ Custom configure flags in the for of ['-x', 'arg']""" - self.custom_configure_flags = [] - ccache = shutil.which("ccache") - if ccache is not None: - self.custom_configure_flags.append("CC={} gcc".format(ccache)) - self.custom_configure_flags.append("CXX={} g++".format(ccache)) - - """ A collection of Project dependencies """ - self.dependencies = [] - - # State - self.isCheckedOut = False - self.isBootStrapped = False - self.isBuilt = False - self.isConfigured = False - self.isInstalled = False - - self.source_path = tmpdir + "/source" - self.installation_path = tmpdir + "/install" - os.makedirs(self.source_path) - os.makedirs(self.installation_path) - self.logger = logging.getLogger('project.{}'.format(self.label)) - - self.special_env_variables = {} - - # Init the repo for work - self.checkout() - self.bootstrap() - - def get_cppflags(self): - return " -I{}/include".format(self.installation_path) - - def get_ldflags(self): - return " -L{}/lib".format(self.installation_path) - - def get_ld_library_path(self): - return "{}/lib".format(self.installation_path) - - def get_env(self): - """Modify environment to reflect dependency""" - cpp_flags = "" - ld_flags = "" - ld_library_path = "" - - env = os.environ.copy() - - for var, value in self.special_env_variables.items(): - if var in env: - # TODO: WARNING log point - # Raise for now since no special cases is known - self.logger.warning("Special var % is already defined", var) - raise Exception("Multiple definition of a special environment variable") - else: - env[var] = value - - for dep in self.dependencies: - # Extra space just in case - cpp_flags += " {}".format(dep.get_cppflags()) - ld_flags += " {}".format(dep.get_ldflags()) - ld_library_path += "{}:".format(dep.get_ld_library_path()) - for var, value in dep.special_env_variables.items(): - if var in env: - # TODO: WARNING log point - # Raise for now since no special cases is known - self.logger.warning("Special var % is already defined", var) - raise Exception("Multiple definition of a special environment variable") - else: - env[var] = value - - # TODO: INFO log point for each variable with project information - if cpp_flags: - if 'CPPFLAGS' in env: - cpp_flags = env['CPPFLAGS'] + cpp_flags - env['CPPFLAGS'] = cpp_flags - if ld_flags: - if 'LDFLAGS' in env: - ld_flags = env['LDFLAGS'] + ld_flags - env['LDFLAGS'] = ld_flags - if ld_library_path: - if 'LD_LIBRARY_PATH' in env: - ld_library_path = env['LD_LIBRARY_PATH'] + ":" + ld_library_path - env['LD_LIBRARY_PATH'] = ld_library_path - return env - - def autobuild(self): - """ - Perform the bootstrap, configuration, build and install the - project. Build dependencies if not already built - """ - for dep in self.dependencies: - dep.autobuild() - - if self.isCheckedOut ^ self.isBootStrapped ^ self.isBootStrapped ^ self.isBuilt ^ self.isConfigured ^ self.isInstalled: - raise Exception("Project steps where manually triggered. Can't autobuild") - - self.configure() - self.build() - self.install() - - def checkout(self): - repo = git.Repo.clone_from(self.git_path, self.source_path) - commit = repo.commit(self.sha1) - repo.head.reference = commit - assert repo.head.is_detached - repo.head.reset(index=True, working_tree=True) - - def bootstrap(self): - """ - Bootstap the project. Raise subprocess.CalledProcessError on - bootstrap error. - """ - os.chdir(self.source_path) - p = subprocess.run(['./bootstrap'], stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - p.check_returncode() - return p - - def configure(self): - """ - Configure the project. - Raises subprocess.CalledProcessError on configure error - """ - # Check that all our dependencies were actually installed - for dep in self.dependencies: - if not dep.isInstalled: - # TODO: Custom exception here Dependency Error - raise Exception("Dependency project flagged as not installed") - - os.chdir(self.source_path) - args = ['./configure'] - prefix = '--prefix={}'.format(self.installation_path) - args.append(prefix) - args.extend(self.custom_configure_flags) - - # TODO: log output and add INFO log point - p = subprocess.run(args, env=self.get_env(), stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - p.check_returncode() - self.isConfigured = True - return p - - def build(self): - """ - Build the project. Raise subprocess.CalledProcessError on build - error. - """ - os.chdir(self.source_path) - args = ['make'] - env = self.get_env() - env['CFLAGS'] = '-g -O0' - - # Number of usable cpu - # https://docs.python.org/3/library/os.html#os.cpu_count - num_cpu = str(len(os.sched_getaffinity(0))) - args.append('-j') - args.append(num_cpu) - - # TODO: log output and add INFO log point with args - p = subprocess.run(args, env=env, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - p.check_returncode() - self.isBuilt = True - return p - - def install(self): - """ - Install the project. Raise subprocess.CalledProcessError on - bootstrap error - """ - os.chdir(self.source_path) - args = ['make', 'install'] - - # TODO: log output and add INFO log point - p = subprocess.run(args, env=self.get_env(), stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - p.check_returncode() - self.isInstalled = True - return p - - def cleanup(self): - if os.path.exists(self.source_path): - shutil.rmtree(self.source_path) - if os.path.exists(self.installation_path): - shutil.rmtree(self.installation_path) - - -class Lttng_modules(Project): - def bootstrap(self): - pass - - def configure(self): - pass - - def install(self): - os.chdir(self.source_path) - args = ['make', 'INSTALL_MOD_PATH={}'.format(self.installation_path), - 'modules_install'] - p = subprocess.run(args, env=self.get_env(), stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - p.check_returncode() - - # Perform a local depmod - args = ['depmod', '-b', self.installation_path] - p = subprocess.run(args, env=self.get_env()) - p.check_returncode() - self.isInstalled = True - - -class Lttng_ust(Project): - def __init__(self, label, git_path, sha1, tmpdir): - super(Lttng_ust, self).__init__(label=label, git_path=git_path, - sha1=sha1, tmpdir=tmpdir) - self.custom_configure_flags.extend(['--disable-man-pages']) - - -class Lttng_tools(Project): - pass - - -class Babeltrace(Project): - pass diff --git a/lttng_b_test/utils/skip.py b/lttng_b_test/utils/skip.py deleted file mode 100644 index 10f92d3..0000000 --- a/lttng_b_test/utils/skip.py +++ /dev/null @@ -1,4 +0,0 @@ -import os -import pytest - -root = pytest.mark.skipif(os.geteuid() != 0, reason="Must be run as root") -- 2.34.1