From: Jonathan Rajotte Date: Mon, 2 Oct 2017 21:55:23 +0000 (-0400) Subject: Cleanuop to squash X-Git-Url: http://git.efficios.com/?p=deliverable%2Flttng-ivc.git;a=commitdiff_plain;h=0317c498ce8ca91852e7f1c7c2ec9abc49c87168 Cleanuop to squash Signed-off-by: Jonathan Rajotte --- 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 c309682..0000000 Binary files a/lttng_b_test/__pycache__/__init__.cpython-35.pyc and /dev/null differ 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 2d0c198..0000000 Binary files a/lttng_b_test/__pycache__/settings.cpython-35.pyc and /dev/null differ 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 d8ac39a..0000000 Binary files a/lttng_b_test/tests/__pycache__/__init__.cpython-35.pyc and /dev/null differ diff --git a/lttng_b_test/tests/__pycache__/test_base.cpython-35-PYTEST.pyc b/lttng_b_test/tests/__pycache__/test_base.cpython-35-PYTEST.pyc deleted file mode 100644 index 30ea249..0000000 Binary files a/lttng_b_test/tests/__pycache__/test_base.cpython-35-PYTEST.pyc and /dev/null differ 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 fcf101f..0000000 Binary files a/lttng_b_test/tests/ust_soname_vs_tools/__pycache__/__init__.cpython-35.pyc and /dev/null differ 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 dd42dcd..0000000 Binary files a/lttng_b_test/tests/ust_soname_vs_tools/__pycache__/test_base.cpython-35-PYTEST.pyc and /dev/null differ 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 5939cfa..0000000 Binary files a/lttng_b_test/tests/ust_soname_vs_tools/__pycache__/test_ust_so_name_vs_tools.cpython-35-PYTEST.pyc and /dev/null differ diff --git a/lttng_b_test/tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py b/lttng_b_test/tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py deleted file mode 100644 index 1d54f6f..0000000 --- a/lttng_b_test/tests/ust_soname_vs_tools/test_ust_so_name_vs_tools.py +++ /dev/null @@ -1,122 +0,0 @@ -import pytest -import lttng_b_test.utils.ProjectFactory as ProjectFactory -import lttng_b_test.settings as project_settings -import subprocess - -""" -TODO: Document how the tests is donne and what it tests - -At configure time -At build time -At run time - -Always include a documentation matrix: -FC: Fully Compatible -BC: Backward Compatible -I: Incompatible - -+------------------------------------------------------------------+ -| LTTng UST control library vs LTTng Tools | -+-----------------------------------------+-----+-----+-----+------+ -| LTTng UST Control(soname) / LTTng Tools | 2.7 | 2.8 | 2.9 | 2.10 | -+-----------------------------------------+-----+-----+-----+------+ -| 2.7 (2.0.0) | FC | I | I | I | -| 2.8 (2.0.0) | BC | FC | I | I | -| 2.9 (2.0.0) | BC | BC | FC | I | -| 2.10 (4.0.0) | I | I | I | FC | -+-----------------------------------------+-----+-----+-----+------+ - -In this scenario: - -FC and BC must pass configure, build and run time -I must fail at configure, build and run time. - -""" - -""" -First tuple member: lttng-ust label -Second tuple member: lttng-tool label -Third tuple member: Success. - True -> 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 95e72be..0000000 Binary files a/lttng_b_test/utils/.ProjectFactory.py.swp and /dev/null differ diff --git a/lttng_b_test/utils/.project.py.swp b/lttng_b_test/utils/.project.py.swp deleted file mode 100644 index 71910d9..0000000 Binary files a/lttng_b_test/utils/.project.py.swp and /dev/null differ 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 d22764c..0000000 Binary files a/lttng_b_test/utils/__pycache__/ProjectFactory.cpython-35.pyc and /dev/null differ diff --git a/lttng_b_test/utils/__pycache__/project.cpython-35.pyc b/lttng_b_test/utils/__pycache__/project.cpython-35.pyc deleted file mode 100644 index 27d0c5b..0000000 Binary files a/lttng_b_test/utils/__pycache__/project.cpython-35.pyc and /dev/null differ 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 25fbb7f..0000000 Binary files a/lttng_b_test/utils/__pycache__/skip.cpython-35.pyc and /dev/null differ 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")