From bbff0ab4992445a57cb04e35da8e63b8ed32ea38 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 13 Jun 2019 16:18:40 -0400 Subject: [PATCH] tests: Move data files to a common directory * Reduce errors when adding new data files, a single EXTRA_DIST directive in tests/Makefile.am will cover all data files * Standardise variables used to refer to the data files path and add them to 'utils/common.sh'. Signed-off-by: Michael Jeanson Change-Id: I5fd06e5280e5864593aca8e964eeda9121b8a48e Reviewed-on: https://review.lttng.org/c/babeltrace/+/1428 Tested-by: jenkins Reviewed-by: Philippe Proulx --- tests/Makefile.am | 3 +-- tests/bindings/python/bt2/test_python_bt2.in | 3 ++- .../bt2/test_trace_collection_message_iterator.py | 4 ++-- tests/cli/test_intersection.in | 10 +++++----- tests/cli/test_output_ctf_metadata.in | 6 +++--- tests/cli/test_packet_seq_num.in | 10 +++++----- tests/cli/test_trace_copy.in | 2 +- tests/cli/test_trace_read.in | 4 ++-- tests/cli/test_trimmer.in | 2 +- tests/{ => data}/cli/test_output_ctf_metadata.ref | 0 tests/{ => data}/ctf-traces/fail/fail1/dummystream | Bin tests/{ => data}/ctf-traces/fail/fail1/metadata | 0 tests/{ => data}/ctf-traces/fail/fail2/metadata | Bin .../ctf-traces/fail/integer-range/metadata | 0 .../ctf-traces/fail/lttng-modules-2.0-pre1/metadata | Bin .../ctf-traces/fail/packet-based-metadata/metadata | Bin .../ctf-traces/fail/smalltrace/dummystream-fail | 0 .../{ => data}/ctf-traces/fail/smalltrace/metadata | 0 .../intersection/3eventsintersect/metadata | 0 .../intersection/3eventsintersect/test_stream_0 | Bin .../intersection/3eventsintersect/test_stream_1 | Bin .../intersection/3eventsintersectreverse/metadata | 0 .../3eventsintersectreverse/test_stream_0 | Bin .../3eventsintersectreverse/test_stream_1 | Bin .../ctf-traces/intersection/nointersect/metadata | 0 .../intersection/nointersect/test_stream_0 | Bin .../intersection/nointersect/test_stream_1 | Bin .../ctf-traces/intersection/nostream/metadata | 0 .../ctf-traces/intersection/onestream/metadata | 0 .../ctf-traces/intersection/onestream/test_stream_0 | Bin .../packet_seq_num/2_lost_before_last/metadata | 0 .../packet_seq_num/2_lost_before_last/test_stream_0 | Bin .../packet_seq_num/2_streams_lost_in_1/metadata | 0 .../2_streams_lost_in_1/test_stream_0 | Bin .../2_streams_lost_in_1/test_stream_1 | Bin .../packet_seq_num/2_streams_lost_in_2/metadata | 0 .../2_streams_lost_in_2/test_stream_0 | Bin .../2_streams_lost_in_2/test_stream_1 | Bin .../ctf-traces/packet_seq_num/no_lost/metadata | 0 .../ctf-traces/packet_seq_num/no_lost/test_stream_0 | Bin .../no_lost_not_starting_at_0/metadata | 0 .../no_lost_not_starting_at_0/test_stream_0 | Bin .../ctf-traces/succeed/env-warning/dummystream | Bin .../ctf-traces/succeed/env-warning/metadata | 0 .../succeed/ev-disc-no-ts-begin-end/metadata | 0 .../succeed/ev-disc-no-ts-begin-end/stream | Bin .../ctf-traces/succeed/no-packet-context/metadata | 0 .../ctf-traces/succeed/no-packet-context/stream | Bin .../ctf-traces/succeed/sequence/channel0_0 | Bin .../ctf-traces/succeed/sequence/channel0_1 | Bin .../ctf-traces/succeed/sequence/channel0_2 | Bin .../ctf-traces/succeed/sequence/channel0_3 | Bin .../{ => data}/ctf-traces/succeed/sequence/metadata | 0 .../ctf-traces/succeed/smalltrace/dummystream | Bin .../ctf-traces/succeed/smalltrace/metadata | 0 .../ctf-traces/succeed/succeed1/dummystream | Bin .../{ => data}/ctf-traces/succeed/succeed1/metadata | 0 .../ctf-traces/succeed/succeed2/dummystream | Bin .../{ => data}/ctf-traces/succeed/succeed2/metadata | 0 .../ctf-traces/succeed/succeed3/dummystream | Bin .../{ => data}/ctf-traces/succeed/succeed3/metadata | 0 .../{ => data}/ctf-traces/succeed/succeed4/metadata | 0 .../ctf-traces/succeed/warnings/dummystream | Bin .../{ => data}/ctf-traces/succeed/warnings/metadata | 0 .../ctf-traces/succeed/wk-heartbeat-u/metadata | Bin .../ctf-traces/succeed/wk-heartbeat-u/u_0 | Bin .../ctf-traces/succeed/wk-heartbeat-u/u_1 | Bin .../ctf-traces/succeed/wk-heartbeat-u/u_2 | Bin .../ctf-traces/succeed/wk-heartbeat-u/u_3 | Bin .../ctf-traces/succeed/wk-heartbeat-u/u_4 | Bin .../ctf-traces/succeed/wk-heartbeat-u/u_5 | Bin .../ctf-traces/succeed/wk-heartbeat-u/u_6 | Bin .../ctf-traces/succeed/wk-heartbeat-u/u_7 | Bin tests/{debug-info-data => data/debug-info}/Makefile | 0 .../{debug-info-data => data/debug-info}/README.md | 0 .../cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug | Bin .../debug-info}/i386-linux-gnu/build_id/libhello_so | Bin .../i386-linux-gnu/debug_link/libhello_so | Bin .../i386-linux-gnu/debug_link/libhello_so.debug | Bin .../i386-linux-gnu/dwarf_full/libhello_so | Bin .../debug-info}/i386-linux-gnu/elf_only/libhello_so | Bin .../{debug-info-data => data/debug-info}/libhello.c | 0 .../{debug-info-data => data/debug-info}/libhello.h | 0 tests/{debug-info-data => data/debug-info}/main.c | 0 .../cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug | Bin .../powerpc-linux-gnu/build_id/libhello_so | Bin .../powerpc-linux-gnu/debug_link/libhello_so | Bin .../powerpc-linux-gnu/debug_link/libhello_so.debug | Bin .../powerpc-linux-gnu/dwarf_full/libhello_so | Bin .../powerpc-linux-gnu/elf_only/libhello_so | Bin .../cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug | Bin .../powerpc64le-linux-gnu/build_id/libhello_so | Bin .../powerpc64le-linux-gnu/debug_link/libhello_so | Bin .../debug_link/libhello_so.debug | Bin .../powerpc64le-linux-gnu/dwarf_full/libhello_so | Bin .../powerpc64le-linux-gnu/elf_only/libhello_so | Bin tests/{debug-info-data => data/debug-info}/tp.c | 0 tests/{debug-info-data => data/debug-info}/tp.h | 0 .../debug-info}/trace/metadata | 0 .../debug-info}/trace/stream_0_0 | Bin .../cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug | Bin .../x86_64-linux-gnu/build_id/libhello_so | Bin .../x86_64-linux-gnu/debug_link/libhello_so | Bin .../x86_64-linux-gnu/debug_link/libhello_so.debug | Bin .../x86_64-linux-gnu/dwarf_full/libhello_so | Bin .../x86_64-linux-gnu/elf_only/libhello_so | Bin .../plugins/src.ctf.fs/succeed/trace-simple.expect | 0 .../src.ctf.fs/succeed/trace-smalltrace.expect | 0 .../test_bin_info_i386-linux-gnu.in | 2 +- .../test_bin_info_powerpc-linux-gnu.in | 2 +- .../test_bin_info_powerpc64le-linux-gnu.in | 2 +- .../test_bin_info_x86_64-linux-gnu.in | 2 +- .../test_dwarf_i386-linux-gnu.in | 2 +- .../test_dwarf_powerpc-linux-gnu.in | 2 +- .../test_dwarf_powerpc64le-linux-gnu.in | 2 +- .../test_dwarf_x86_64-linux-gnu.in | 2 +- .../test_lttng_utils_debug_info.in | 2 +- .../test_lttng_utils_debug_info.py | 6 +++--- .../src.ctf.fs/query/test_query_trace_info.py | 8 ++++---- tests/plugins/src.ctf.fs/succeed/Makefile.am | 5 ----- tests/plugins/src.ctf.fs/succeed/test_succeed.in | 4 ++-- tests/utils/common.sh.in | 3 ++- tests/utils/test_python_bt2_env.in | 3 ++- 123 files changed, 44 insertions(+), 47 deletions(-) rename tests/{ => data}/cli/test_output_ctf_metadata.ref (100%) rename tests/{ => data}/ctf-traces/fail/fail1/dummystream (100%) rename tests/{ => data}/ctf-traces/fail/fail1/metadata (100%) rename tests/{ => data}/ctf-traces/fail/fail2/metadata (100%) rename tests/{ => data}/ctf-traces/fail/integer-range/metadata (100%) rename tests/{ => data}/ctf-traces/fail/lttng-modules-2.0-pre1/metadata (100%) rename tests/{ => data}/ctf-traces/fail/packet-based-metadata/metadata (100%) rename tests/{ => data}/ctf-traces/fail/smalltrace/dummystream-fail (100%) rename tests/{ => data}/ctf-traces/fail/smalltrace/metadata (100%) rename tests/{ => data}/ctf-traces/intersection/3eventsintersect/metadata (100%) rename tests/{ => data}/ctf-traces/intersection/3eventsintersect/test_stream_0 (100%) rename tests/{ => data}/ctf-traces/intersection/3eventsintersect/test_stream_1 (100%) rename tests/{ => data}/ctf-traces/intersection/3eventsintersectreverse/metadata (100%) rename tests/{ => data}/ctf-traces/intersection/3eventsintersectreverse/test_stream_0 (100%) rename tests/{ => data}/ctf-traces/intersection/3eventsintersectreverse/test_stream_1 (100%) rename tests/{ => data}/ctf-traces/intersection/nointersect/metadata (100%) rename tests/{ => data}/ctf-traces/intersection/nointersect/test_stream_0 (100%) rename tests/{ => data}/ctf-traces/intersection/nointersect/test_stream_1 (100%) rename tests/{ => data}/ctf-traces/intersection/nostream/metadata (100%) rename tests/{ => data}/ctf-traces/intersection/onestream/metadata (100%) rename tests/{ => data}/ctf-traces/intersection/onestream/test_stream_0 (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/2_lost_before_last/metadata (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/2_lost_before_last/test_stream_0 (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/2_streams_lost_in_1/metadata (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/2_streams_lost_in_1/test_stream_0 (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/2_streams_lost_in_1/test_stream_1 (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/2_streams_lost_in_2/metadata (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/2_streams_lost_in_2/test_stream_0 (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/2_streams_lost_in_2/test_stream_1 (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/no_lost/metadata (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/no_lost/test_stream_0 (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/no_lost_not_starting_at_0/metadata (100%) rename tests/{ => data}/ctf-traces/packet_seq_num/no_lost_not_starting_at_0/test_stream_0 (100%) rename tests/{ => data}/ctf-traces/succeed/env-warning/dummystream (100%) rename tests/{ => data}/ctf-traces/succeed/env-warning/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/ev-disc-no-ts-begin-end/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/ev-disc-no-ts-begin-end/stream (100%) rename tests/{ => data}/ctf-traces/succeed/no-packet-context/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/no-packet-context/stream (100%) rename tests/{ => data}/ctf-traces/succeed/sequence/channel0_0 (100%) rename tests/{ => data}/ctf-traces/succeed/sequence/channel0_1 (100%) rename tests/{ => data}/ctf-traces/succeed/sequence/channel0_2 (100%) rename tests/{ => data}/ctf-traces/succeed/sequence/channel0_3 (100%) rename tests/{ => data}/ctf-traces/succeed/sequence/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/smalltrace/dummystream (100%) rename tests/{ => data}/ctf-traces/succeed/smalltrace/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/succeed1/dummystream (100%) rename tests/{ => data}/ctf-traces/succeed/succeed1/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/succeed2/dummystream (100%) rename tests/{ => data}/ctf-traces/succeed/succeed2/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/succeed3/dummystream (100%) rename tests/{ => data}/ctf-traces/succeed/succeed3/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/succeed4/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/warnings/dummystream (100%) rename tests/{ => data}/ctf-traces/succeed/warnings/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/wk-heartbeat-u/metadata (100%) rename tests/{ => data}/ctf-traces/succeed/wk-heartbeat-u/u_0 (100%) rename tests/{ => data}/ctf-traces/succeed/wk-heartbeat-u/u_1 (100%) rename tests/{ => data}/ctf-traces/succeed/wk-heartbeat-u/u_2 (100%) rename tests/{ => data}/ctf-traces/succeed/wk-heartbeat-u/u_3 (100%) rename tests/{ => data}/ctf-traces/succeed/wk-heartbeat-u/u_4 (100%) rename tests/{ => data}/ctf-traces/succeed/wk-heartbeat-u/u_5 (100%) rename tests/{ => data}/ctf-traces/succeed/wk-heartbeat-u/u_6 (100%) rename tests/{ => data}/ctf-traces/succeed/wk-heartbeat-u/u_7 (100%) rename tests/{debug-info-data => data/debug-info}/Makefile (100%) rename tests/{debug-info-data => data/debug-info}/README.md (100%) rename tests/{debug-info-data => data/debug-info}/i386-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug (100%) rename tests/{debug-info-data => data/debug-info}/i386-linux-gnu/build_id/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/i386-linux-gnu/debug_link/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/i386-linux-gnu/debug_link/libhello_so.debug (100%) rename tests/{debug-info-data => data/debug-info}/i386-linux-gnu/dwarf_full/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/i386-linux-gnu/elf_only/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/libhello.c (100%) rename tests/{debug-info-data => data/debug-info}/libhello.h (100%) rename tests/{debug-info-data => data/debug-info}/main.c (100%) rename tests/{debug-info-data => data/debug-info}/powerpc-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug (100%) rename tests/{debug-info-data => data/debug-info}/powerpc-linux-gnu/build_id/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/powerpc-linux-gnu/debug_link/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/powerpc-linux-gnu/debug_link/libhello_so.debug (100%) rename tests/{debug-info-data => data/debug-info}/powerpc-linux-gnu/dwarf_full/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/powerpc-linux-gnu/elf_only/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/powerpc64le-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug (100%) rename tests/{debug-info-data => data/debug-info}/powerpc64le-linux-gnu/build_id/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/powerpc64le-linux-gnu/debug_link/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/powerpc64le-linux-gnu/debug_link/libhello_so.debug (100%) rename tests/{debug-info-data => data/debug-info}/powerpc64le-linux-gnu/dwarf_full/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/powerpc64le-linux-gnu/elf_only/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/tp.c (100%) rename tests/{debug-info-data => data/debug-info}/tp.h (100%) rename tests/{debug-info-data => data/debug-info}/trace/metadata (100%) rename tests/{debug-info-data => data/debug-info}/trace/stream_0_0 (100%) rename tests/{debug-info-data => data/debug-info}/x86_64-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug (100%) rename tests/{debug-info-data => data/debug-info}/x86_64-linux-gnu/build_id/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/x86_64-linux-gnu/debug_link/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/x86_64-linux-gnu/debug_link/libhello_so.debug (100%) rename tests/{debug-info-data => data/debug-info}/x86_64-linux-gnu/dwarf_full/libhello_so (100%) rename tests/{debug-info-data => data/debug-info}/x86_64-linux-gnu/elf_only/libhello_so (100%) rename tests/{ => data}/plugins/src.ctf.fs/succeed/trace-simple.expect (100%) rename tests/{ => data}/plugins/src.ctf.fs/succeed/trace-smalltrace.expect (100%) diff --git a/tests/Makefile.am b/tests/Makefile.am index 60694d93..92472785 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = utils lib ctf-writer plugins # Directories added to EXTRA_DIST will be recursively copied to the distribution. -EXTRA_DIST = $(srcdir)/ctf-traces \ - $(srcdir)/debug-info-data \ +EXTRA_DIST = $(srcdir)/data \ bindings/python/bt2/.coveragerc dist_check_SCRIPTS = \ diff --git a/tests/bindings/python/bt2/test_python_bt2.in b/tests/bindings/python/bt2/test_python_bt2.in index e9941018..a067f7fb 100644 --- a/tests/bindings/python/bt2/test_python_bt2.in +++ b/tests/bindings/python/bt2/test_python_bt2.in @@ -27,7 +27,8 @@ check_coverage() { export BABELTRACE_PYTHON_BT2_NO_TRACEBACK=1 export TEST_PLUGIN_PLUGINS_PATH="${BT_BUILD_PATH}/src/plugins" export BABELTRACE_PLUGIN_PATH="${BT_BUILD_PATH}/src/plugins/ctf:${BT_BUILD_PATH}/src/plugins/utils:${BT_BUILD_PATH}/src/plugins/text" -export TEST_CTF_TRACES_PATH="${BT_SRC_PATH}/tests/ctf-traces" +export BT_CTF_TRACES_PATH + PYTHON_BUILD_DIR="${BT_BUILD_PATH}/src/bindings/python/bt2/build/build_lib" TESTS_UTILS_PYTHON_DIR="${BT_SRC_PATH}/tests/utils/python" TESTRUNNER_PY="${BT_SRC_PATH}/tests/utils/python/testrunner.py" diff --git a/tests/bindings/python/bt2/test_trace_collection_message_iterator.py b/tests/bindings/python/bt2/test_trace_collection_message_iterator.py index e30cad43..64a974dc 100644 --- a/tests/bindings/python/bt2/test_trace_collection_message_iterator.py +++ b/tests/bindings/python/bt2/test_trace_collection_message_iterator.py @@ -5,8 +5,8 @@ import os import os.path -_TEST_CTF_TRACES_PATH = os.environ['TEST_CTF_TRACES_PATH'] -_3EVENTS_INTERSECT_TRACE_PATH = os.path.join(_TEST_CTF_TRACES_PATH, +_BT_CTF_TRACES_PATH = os.environ['BT_CTF_TRACES_PATH'] +_3EVENTS_INTERSECT_TRACE_PATH = os.path.join(_BT_CTF_TRACES_PATH, 'intersection', '3eventsintersect') diff --git a/tests/cli/test_intersection.in b/tests/cli/test_intersection.in index 7cea9be7..b84ec8ab 100644 --- a/tests/cli/test_intersection.in +++ b/tests/cli/test_intersection.in @@ -35,16 +35,16 @@ test_intersect() { diag "Test the stream intersection feature" diag "2 streams offsetted with 3 packets intersecting" -test_intersect "${BT_CTF_TRACES}/intersection/3eventsintersect" 8 3 +test_intersect "${BT_CTF_TRACES_PATH}/intersection/3eventsintersect" 8 3 diag "2 streams offsetted with 3 packets intersecting (exchanged file names)" -test_intersect "${BT_CTF_TRACES}/intersection/3eventsintersectreverse" 8 3 +test_intersect "${BT_CTF_TRACES_PATH}/intersection/3eventsintersectreverse" 8 3 diag "No intersection between 2 streams" -test_intersect "${BT_CTF_TRACES}/intersection/nointersect" 6 0 +test_intersect "${BT_CTF_TRACES_PATH}/intersection/nointersect" 6 0 diag "Only 1 stream" -test_intersect "${BT_CTF_TRACES}/intersection/onestream" 3 3 +test_intersect "${BT_CTF_TRACES_PATH}/intersection/onestream" 3 3 diag "No stream at all" -test_intersect "${BT_CTF_TRACES}/intersection/nostream" 0 0 +test_intersect "${BT_CTF_TRACES_PATH}/intersection/nostream" 0 0 diff --git a/tests/cli/test_output_ctf_metadata.in b/tests/cli/test_output_ctf_metadata.in index d01be19b..e39bbc49 100644 --- a/tests/cli/test_output_ctf_metadata.in +++ b/tests/cli/test_output_ctf_metadata.in @@ -25,12 +25,12 @@ plan_tests $NUM_TESTS tmp_metadata=$(mktemp) # Test a valid trace directory. -"${BT_BIN}" -o ctf-metadata "${BT_CTF_TRACES}/succeed/wk-heartbeat-u" > "$tmp_metadata" +"${BT_BIN}" -o ctf-metadata "${BT_CTF_TRACES_PATH}/succeed/wk-heartbeat-u" > "$tmp_metadata" ok $? "Run babeltrace -o ctf-metadata with a valid trace directory, correct exit status" -cmp -s "$tmp_metadata" "${BT_SRC_PATH}/tests/cli/test_output_ctf_metadata.ref" +cmp -s "$tmp_metadata" "${BT_SRC_PATH}/tests/data/cli/test_output_ctf_metadata.ref" ok $? "Run babeltrace -o ctf-metadata with a valid trace directory, correct output" # Test an invalid trace directory. -"${BT_BIN}" -o ctf-metadata "${BT_CTF_TRACES}" &> /dev/null +"${BT_BIN}" -o ctf-metadata "${BT_CTF_TRACES_PATH}" &> /dev/null isnt $? 0 "Run babeltrace -o ctf-metadata with an invalid trace directory, expecting failure" diff --git a/tests/cli/test_packet_seq_num.in b/tests/cli/test_packet_seq_num.in index 38a6bf29..3a42f8f9 100644 --- a/tests/cli/test_packet_seq_num.in +++ b/tests/cli/test_packet_seq_num.in @@ -55,16 +55,16 @@ test_lost() { diag "Test the packet_seq_num validation" diag "No packet lost" -test_no_lost "${BT_CTF_TRACES}/packet_seq_num/no_lost" +test_no_lost "${BT_CTF_TRACES_PATH}/packet_seq_num/no_lost" diag "No packet lost, packet_seq_num not starting at 0" -test_no_lost "${BT_CTF_TRACES}/packet_seq_num/no_lost_not_starting_at_0" +test_no_lost "${BT_CTF_TRACES_PATH}/packet_seq_num/no_lost_not_starting_at_0" diag "1 stream, 2 packets lost before the last packet" -test_lost "${BT_CTF_TRACES}/packet_seq_num/2_lost_before_last" "2" +test_lost "${BT_CTF_TRACES_PATH}/packet_seq_num/2_lost_before_last" "2" diag "2 streams, packets lost in one of them" -test_lost "${BT_CTF_TRACES}/packet_seq_num/2_streams_lost_in_1" "2" +test_lost "${BT_CTF_TRACES_PATH}/packet_seq_num/2_streams_lost_in_1" "2" diag "2 streams, packets lost in both" -test_lost "${BT_CTF_TRACES}/packet_seq_num/2_streams_lost_in_2" "2,3,1" +test_lost "${BT_CTF_TRACES_PATH}/packet_seq_num/2_streams_lost_in_2" "2,3,1" diff --git a/tests/cli/test_trace_copy.in b/tests/cli/test_trace_copy.in index ca37ced4..c9047460 100644 --- a/tests/cli/test_trace_copy.in +++ b/tests/cli/test_trace_copy.in @@ -21,7 +21,7 @@ clean_tmp() { rm -rf "${out_path}" "${text_output1}" "${text_output2}" } -SUCCESS_TRACES=(${BT_CTF_TRACES}/succeed/*) +SUCCESS_TRACES=(${BT_CTF_TRACES_PATH}/succeed/*) # -2 because there is an empty trace that we skip NUM_TESTS=$((${#SUCCESS_TRACES[@]} * 3 - 2)) diff --git a/tests/cli/test_trace_read.in b/tests/cli/test_trace_read.in index e9857eef..5cd6344a 100644 --- a/tests/cli/test_trace_read.in +++ b/tests/cli/test_trace_read.in @@ -17,8 +17,8 @@ . "@abs_top_builddir@/tests/utils/common.sh" -SUCCESS_TRACES=(${BT_CTF_TRACES}/succeed/*) -FAIL_TRACES=(${BT_CTF_TRACES}/fail/*) +SUCCESS_TRACES=(${BT_CTF_TRACES_PATH}/succeed/*) +FAIL_TRACES=(${BT_CTF_TRACES_PATH}/fail/*) NUM_TESTS=$((${#SUCCESS_TRACES[@]} + ${#FAIL_TRACES[@]})) diff --git a/tests/cli/test_trimmer.in b/tests/cli/test_trimmer.in index 8c853aea..f40ab444 100644 --- a/tests/cli/test_trimmer.in +++ b/tests/cli/test_trimmer.in @@ -17,7 +17,7 @@ . "@abs_top_builddir@/tests/utils/common.sh" -TRACE_PATH="${BT_CTF_TRACES}/succeed/wk-heartbeat-u/" +TRACE_PATH="${BT_CTF_TRACES_PATH}/succeed/wk-heartbeat-u/" NUM_TESTS=40 diff --git a/tests/cli/test_output_ctf_metadata.ref b/tests/data/cli/test_output_ctf_metadata.ref similarity index 100% rename from tests/cli/test_output_ctf_metadata.ref rename to tests/data/cli/test_output_ctf_metadata.ref diff --git a/tests/ctf-traces/fail/fail1/dummystream b/tests/data/ctf-traces/fail/fail1/dummystream similarity index 100% rename from tests/ctf-traces/fail/fail1/dummystream rename to tests/data/ctf-traces/fail/fail1/dummystream diff --git a/tests/ctf-traces/fail/fail1/metadata b/tests/data/ctf-traces/fail/fail1/metadata similarity index 100% rename from tests/ctf-traces/fail/fail1/metadata rename to tests/data/ctf-traces/fail/fail1/metadata diff --git a/tests/ctf-traces/fail/fail2/metadata b/tests/data/ctf-traces/fail/fail2/metadata similarity index 100% rename from tests/ctf-traces/fail/fail2/metadata rename to tests/data/ctf-traces/fail/fail2/metadata diff --git a/tests/ctf-traces/fail/integer-range/metadata b/tests/data/ctf-traces/fail/integer-range/metadata similarity index 100% rename from tests/ctf-traces/fail/integer-range/metadata rename to tests/data/ctf-traces/fail/integer-range/metadata diff --git a/tests/ctf-traces/fail/lttng-modules-2.0-pre1/metadata b/tests/data/ctf-traces/fail/lttng-modules-2.0-pre1/metadata similarity index 100% rename from tests/ctf-traces/fail/lttng-modules-2.0-pre1/metadata rename to tests/data/ctf-traces/fail/lttng-modules-2.0-pre1/metadata diff --git a/tests/ctf-traces/fail/packet-based-metadata/metadata b/tests/data/ctf-traces/fail/packet-based-metadata/metadata similarity index 100% rename from tests/ctf-traces/fail/packet-based-metadata/metadata rename to tests/data/ctf-traces/fail/packet-based-metadata/metadata diff --git a/tests/ctf-traces/fail/smalltrace/dummystream-fail b/tests/data/ctf-traces/fail/smalltrace/dummystream-fail similarity index 100% rename from tests/ctf-traces/fail/smalltrace/dummystream-fail rename to tests/data/ctf-traces/fail/smalltrace/dummystream-fail diff --git a/tests/ctf-traces/fail/smalltrace/metadata b/tests/data/ctf-traces/fail/smalltrace/metadata similarity index 100% rename from tests/ctf-traces/fail/smalltrace/metadata rename to tests/data/ctf-traces/fail/smalltrace/metadata diff --git a/tests/ctf-traces/intersection/3eventsintersect/metadata b/tests/data/ctf-traces/intersection/3eventsintersect/metadata similarity index 100% rename from tests/ctf-traces/intersection/3eventsintersect/metadata rename to tests/data/ctf-traces/intersection/3eventsintersect/metadata diff --git a/tests/ctf-traces/intersection/3eventsintersect/test_stream_0 b/tests/data/ctf-traces/intersection/3eventsintersect/test_stream_0 similarity index 100% rename from tests/ctf-traces/intersection/3eventsintersect/test_stream_0 rename to tests/data/ctf-traces/intersection/3eventsintersect/test_stream_0 diff --git a/tests/ctf-traces/intersection/3eventsintersect/test_stream_1 b/tests/data/ctf-traces/intersection/3eventsintersect/test_stream_1 similarity index 100% rename from tests/ctf-traces/intersection/3eventsintersect/test_stream_1 rename to tests/data/ctf-traces/intersection/3eventsintersect/test_stream_1 diff --git a/tests/ctf-traces/intersection/3eventsintersectreverse/metadata b/tests/data/ctf-traces/intersection/3eventsintersectreverse/metadata similarity index 100% rename from tests/ctf-traces/intersection/3eventsintersectreverse/metadata rename to tests/data/ctf-traces/intersection/3eventsintersectreverse/metadata diff --git a/tests/ctf-traces/intersection/3eventsintersectreverse/test_stream_0 b/tests/data/ctf-traces/intersection/3eventsintersectreverse/test_stream_0 similarity index 100% rename from tests/ctf-traces/intersection/3eventsintersectreverse/test_stream_0 rename to tests/data/ctf-traces/intersection/3eventsintersectreverse/test_stream_0 diff --git a/tests/ctf-traces/intersection/3eventsintersectreverse/test_stream_1 b/tests/data/ctf-traces/intersection/3eventsintersectreverse/test_stream_1 similarity index 100% rename from tests/ctf-traces/intersection/3eventsintersectreverse/test_stream_1 rename to tests/data/ctf-traces/intersection/3eventsintersectreverse/test_stream_1 diff --git a/tests/ctf-traces/intersection/nointersect/metadata b/tests/data/ctf-traces/intersection/nointersect/metadata similarity index 100% rename from tests/ctf-traces/intersection/nointersect/metadata rename to tests/data/ctf-traces/intersection/nointersect/metadata diff --git a/tests/ctf-traces/intersection/nointersect/test_stream_0 b/tests/data/ctf-traces/intersection/nointersect/test_stream_0 similarity index 100% rename from tests/ctf-traces/intersection/nointersect/test_stream_0 rename to tests/data/ctf-traces/intersection/nointersect/test_stream_0 diff --git a/tests/ctf-traces/intersection/nointersect/test_stream_1 b/tests/data/ctf-traces/intersection/nointersect/test_stream_1 similarity index 100% rename from tests/ctf-traces/intersection/nointersect/test_stream_1 rename to tests/data/ctf-traces/intersection/nointersect/test_stream_1 diff --git a/tests/ctf-traces/intersection/nostream/metadata b/tests/data/ctf-traces/intersection/nostream/metadata similarity index 100% rename from tests/ctf-traces/intersection/nostream/metadata rename to tests/data/ctf-traces/intersection/nostream/metadata diff --git a/tests/ctf-traces/intersection/onestream/metadata b/tests/data/ctf-traces/intersection/onestream/metadata similarity index 100% rename from tests/ctf-traces/intersection/onestream/metadata rename to tests/data/ctf-traces/intersection/onestream/metadata diff --git a/tests/ctf-traces/intersection/onestream/test_stream_0 b/tests/data/ctf-traces/intersection/onestream/test_stream_0 similarity index 100% rename from tests/ctf-traces/intersection/onestream/test_stream_0 rename to tests/data/ctf-traces/intersection/onestream/test_stream_0 diff --git a/tests/ctf-traces/packet_seq_num/2_lost_before_last/metadata b/tests/data/ctf-traces/packet_seq_num/2_lost_before_last/metadata similarity index 100% rename from tests/ctf-traces/packet_seq_num/2_lost_before_last/metadata rename to tests/data/ctf-traces/packet_seq_num/2_lost_before_last/metadata diff --git a/tests/ctf-traces/packet_seq_num/2_lost_before_last/test_stream_0 b/tests/data/ctf-traces/packet_seq_num/2_lost_before_last/test_stream_0 similarity index 100% rename from tests/ctf-traces/packet_seq_num/2_lost_before_last/test_stream_0 rename to tests/data/ctf-traces/packet_seq_num/2_lost_before_last/test_stream_0 diff --git a/tests/ctf-traces/packet_seq_num/2_streams_lost_in_1/metadata b/tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_1/metadata similarity index 100% rename from tests/ctf-traces/packet_seq_num/2_streams_lost_in_1/metadata rename to tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_1/metadata diff --git a/tests/ctf-traces/packet_seq_num/2_streams_lost_in_1/test_stream_0 b/tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_1/test_stream_0 similarity index 100% rename from tests/ctf-traces/packet_seq_num/2_streams_lost_in_1/test_stream_0 rename to tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_1/test_stream_0 diff --git a/tests/ctf-traces/packet_seq_num/2_streams_lost_in_1/test_stream_1 b/tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_1/test_stream_1 similarity index 100% rename from tests/ctf-traces/packet_seq_num/2_streams_lost_in_1/test_stream_1 rename to tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_1/test_stream_1 diff --git a/tests/ctf-traces/packet_seq_num/2_streams_lost_in_2/metadata b/tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_2/metadata similarity index 100% rename from tests/ctf-traces/packet_seq_num/2_streams_lost_in_2/metadata rename to tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_2/metadata diff --git a/tests/ctf-traces/packet_seq_num/2_streams_lost_in_2/test_stream_0 b/tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_2/test_stream_0 similarity index 100% rename from tests/ctf-traces/packet_seq_num/2_streams_lost_in_2/test_stream_0 rename to tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_2/test_stream_0 diff --git a/tests/ctf-traces/packet_seq_num/2_streams_lost_in_2/test_stream_1 b/tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_2/test_stream_1 similarity index 100% rename from tests/ctf-traces/packet_seq_num/2_streams_lost_in_2/test_stream_1 rename to tests/data/ctf-traces/packet_seq_num/2_streams_lost_in_2/test_stream_1 diff --git a/tests/ctf-traces/packet_seq_num/no_lost/metadata b/tests/data/ctf-traces/packet_seq_num/no_lost/metadata similarity index 100% rename from tests/ctf-traces/packet_seq_num/no_lost/metadata rename to tests/data/ctf-traces/packet_seq_num/no_lost/metadata diff --git a/tests/ctf-traces/packet_seq_num/no_lost/test_stream_0 b/tests/data/ctf-traces/packet_seq_num/no_lost/test_stream_0 similarity index 100% rename from tests/ctf-traces/packet_seq_num/no_lost/test_stream_0 rename to tests/data/ctf-traces/packet_seq_num/no_lost/test_stream_0 diff --git a/tests/ctf-traces/packet_seq_num/no_lost_not_starting_at_0/metadata b/tests/data/ctf-traces/packet_seq_num/no_lost_not_starting_at_0/metadata similarity index 100% rename from tests/ctf-traces/packet_seq_num/no_lost_not_starting_at_0/metadata rename to tests/data/ctf-traces/packet_seq_num/no_lost_not_starting_at_0/metadata diff --git a/tests/ctf-traces/packet_seq_num/no_lost_not_starting_at_0/test_stream_0 b/tests/data/ctf-traces/packet_seq_num/no_lost_not_starting_at_0/test_stream_0 similarity index 100% rename from tests/ctf-traces/packet_seq_num/no_lost_not_starting_at_0/test_stream_0 rename to tests/data/ctf-traces/packet_seq_num/no_lost_not_starting_at_0/test_stream_0 diff --git a/tests/ctf-traces/succeed/env-warning/dummystream b/tests/data/ctf-traces/succeed/env-warning/dummystream similarity index 100% rename from tests/ctf-traces/succeed/env-warning/dummystream rename to tests/data/ctf-traces/succeed/env-warning/dummystream diff --git a/tests/ctf-traces/succeed/env-warning/metadata b/tests/data/ctf-traces/succeed/env-warning/metadata similarity index 100% rename from tests/ctf-traces/succeed/env-warning/metadata rename to tests/data/ctf-traces/succeed/env-warning/metadata diff --git a/tests/ctf-traces/succeed/ev-disc-no-ts-begin-end/metadata b/tests/data/ctf-traces/succeed/ev-disc-no-ts-begin-end/metadata similarity index 100% rename from tests/ctf-traces/succeed/ev-disc-no-ts-begin-end/metadata rename to tests/data/ctf-traces/succeed/ev-disc-no-ts-begin-end/metadata diff --git a/tests/ctf-traces/succeed/ev-disc-no-ts-begin-end/stream b/tests/data/ctf-traces/succeed/ev-disc-no-ts-begin-end/stream similarity index 100% rename from tests/ctf-traces/succeed/ev-disc-no-ts-begin-end/stream rename to tests/data/ctf-traces/succeed/ev-disc-no-ts-begin-end/stream diff --git a/tests/ctf-traces/succeed/no-packet-context/metadata b/tests/data/ctf-traces/succeed/no-packet-context/metadata similarity index 100% rename from tests/ctf-traces/succeed/no-packet-context/metadata rename to tests/data/ctf-traces/succeed/no-packet-context/metadata diff --git a/tests/ctf-traces/succeed/no-packet-context/stream b/tests/data/ctf-traces/succeed/no-packet-context/stream similarity index 100% rename from tests/ctf-traces/succeed/no-packet-context/stream rename to tests/data/ctf-traces/succeed/no-packet-context/stream diff --git a/tests/ctf-traces/succeed/sequence/channel0_0 b/tests/data/ctf-traces/succeed/sequence/channel0_0 similarity index 100% rename from tests/ctf-traces/succeed/sequence/channel0_0 rename to tests/data/ctf-traces/succeed/sequence/channel0_0 diff --git a/tests/ctf-traces/succeed/sequence/channel0_1 b/tests/data/ctf-traces/succeed/sequence/channel0_1 similarity index 100% rename from tests/ctf-traces/succeed/sequence/channel0_1 rename to tests/data/ctf-traces/succeed/sequence/channel0_1 diff --git a/tests/ctf-traces/succeed/sequence/channel0_2 b/tests/data/ctf-traces/succeed/sequence/channel0_2 similarity index 100% rename from tests/ctf-traces/succeed/sequence/channel0_2 rename to tests/data/ctf-traces/succeed/sequence/channel0_2 diff --git a/tests/ctf-traces/succeed/sequence/channel0_3 b/tests/data/ctf-traces/succeed/sequence/channel0_3 similarity index 100% rename from tests/ctf-traces/succeed/sequence/channel0_3 rename to tests/data/ctf-traces/succeed/sequence/channel0_3 diff --git a/tests/ctf-traces/succeed/sequence/metadata b/tests/data/ctf-traces/succeed/sequence/metadata similarity index 100% rename from tests/ctf-traces/succeed/sequence/metadata rename to tests/data/ctf-traces/succeed/sequence/metadata diff --git a/tests/ctf-traces/succeed/smalltrace/dummystream b/tests/data/ctf-traces/succeed/smalltrace/dummystream similarity index 100% rename from tests/ctf-traces/succeed/smalltrace/dummystream rename to tests/data/ctf-traces/succeed/smalltrace/dummystream diff --git a/tests/ctf-traces/succeed/smalltrace/metadata b/tests/data/ctf-traces/succeed/smalltrace/metadata similarity index 100% rename from tests/ctf-traces/succeed/smalltrace/metadata rename to tests/data/ctf-traces/succeed/smalltrace/metadata diff --git a/tests/ctf-traces/succeed/succeed1/dummystream b/tests/data/ctf-traces/succeed/succeed1/dummystream similarity index 100% rename from tests/ctf-traces/succeed/succeed1/dummystream rename to tests/data/ctf-traces/succeed/succeed1/dummystream diff --git a/tests/ctf-traces/succeed/succeed1/metadata b/tests/data/ctf-traces/succeed/succeed1/metadata similarity index 100% rename from tests/ctf-traces/succeed/succeed1/metadata rename to tests/data/ctf-traces/succeed/succeed1/metadata diff --git a/tests/ctf-traces/succeed/succeed2/dummystream b/tests/data/ctf-traces/succeed/succeed2/dummystream similarity index 100% rename from tests/ctf-traces/succeed/succeed2/dummystream rename to tests/data/ctf-traces/succeed/succeed2/dummystream diff --git a/tests/ctf-traces/succeed/succeed2/metadata b/tests/data/ctf-traces/succeed/succeed2/metadata similarity index 100% rename from tests/ctf-traces/succeed/succeed2/metadata rename to tests/data/ctf-traces/succeed/succeed2/metadata diff --git a/tests/ctf-traces/succeed/succeed3/dummystream b/tests/data/ctf-traces/succeed/succeed3/dummystream similarity index 100% rename from tests/ctf-traces/succeed/succeed3/dummystream rename to tests/data/ctf-traces/succeed/succeed3/dummystream diff --git a/tests/ctf-traces/succeed/succeed3/metadata b/tests/data/ctf-traces/succeed/succeed3/metadata similarity index 100% rename from tests/ctf-traces/succeed/succeed3/metadata rename to tests/data/ctf-traces/succeed/succeed3/metadata diff --git a/tests/ctf-traces/succeed/succeed4/metadata b/tests/data/ctf-traces/succeed/succeed4/metadata similarity index 100% rename from tests/ctf-traces/succeed/succeed4/metadata rename to tests/data/ctf-traces/succeed/succeed4/metadata diff --git a/tests/ctf-traces/succeed/warnings/dummystream b/tests/data/ctf-traces/succeed/warnings/dummystream similarity index 100% rename from tests/ctf-traces/succeed/warnings/dummystream rename to tests/data/ctf-traces/succeed/warnings/dummystream diff --git a/tests/ctf-traces/succeed/warnings/metadata b/tests/data/ctf-traces/succeed/warnings/metadata similarity index 100% rename from tests/ctf-traces/succeed/warnings/metadata rename to tests/data/ctf-traces/succeed/warnings/metadata diff --git a/tests/ctf-traces/succeed/wk-heartbeat-u/metadata b/tests/data/ctf-traces/succeed/wk-heartbeat-u/metadata similarity index 100% rename from tests/ctf-traces/succeed/wk-heartbeat-u/metadata rename to tests/data/ctf-traces/succeed/wk-heartbeat-u/metadata diff --git a/tests/ctf-traces/succeed/wk-heartbeat-u/u_0 b/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_0 similarity index 100% rename from tests/ctf-traces/succeed/wk-heartbeat-u/u_0 rename to tests/data/ctf-traces/succeed/wk-heartbeat-u/u_0 diff --git a/tests/ctf-traces/succeed/wk-heartbeat-u/u_1 b/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_1 similarity index 100% rename from tests/ctf-traces/succeed/wk-heartbeat-u/u_1 rename to tests/data/ctf-traces/succeed/wk-heartbeat-u/u_1 diff --git a/tests/ctf-traces/succeed/wk-heartbeat-u/u_2 b/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_2 similarity index 100% rename from tests/ctf-traces/succeed/wk-heartbeat-u/u_2 rename to tests/data/ctf-traces/succeed/wk-heartbeat-u/u_2 diff --git a/tests/ctf-traces/succeed/wk-heartbeat-u/u_3 b/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_3 similarity index 100% rename from tests/ctf-traces/succeed/wk-heartbeat-u/u_3 rename to tests/data/ctf-traces/succeed/wk-heartbeat-u/u_3 diff --git a/tests/ctf-traces/succeed/wk-heartbeat-u/u_4 b/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_4 similarity index 100% rename from tests/ctf-traces/succeed/wk-heartbeat-u/u_4 rename to tests/data/ctf-traces/succeed/wk-heartbeat-u/u_4 diff --git a/tests/ctf-traces/succeed/wk-heartbeat-u/u_5 b/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_5 similarity index 100% rename from tests/ctf-traces/succeed/wk-heartbeat-u/u_5 rename to tests/data/ctf-traces/succeed/wk-heartbeat-u/u_5 diff --git a/tests/ctf-traces/succeed/wk-heartbeat-u/u_6 b/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_6 similarity index 100% rename from tests/ctf-traces/succeed/wk-heartbeat-u/u_6 rename to tests/data/ctf-traces/succeed/wk-heartbeat-u/u_6 diff --git a/tests/ctf-traces/succeed/wk-heartbeat-u/u_7 b/tests/data/ctf-traces/succeed/wk-heartbeat-u/u_7 similarity index 100% rename from tests/ctf-traces/succeed/wk-heartbeat-u/u_7 rename to tests/data/ctf-traces/succeed/wk-heartbeat-u/u_7 diff --git a/tests/debug-info-data/Makefile b/tests/data/debug-info/Makefile similarity index 100% rename from tests/debug-info-data/Makefile rename to tests/data/debug-info/Makefile diff --git a/tests/debug-info-data/README.md b/tests/data/debug-info/README.md similarity index 100% rename from tests/debug-info-data/README.md rename to tests/data/debug-info/README.md diff --git a/tests/debug-info-data/i386-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug b/tests/data/debug-info/i386-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug similarity index 100% rename from tests/debug-info-data/i386-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug rename to tests/data/debug-info/i386-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug diff --git a/tests/debug-info-data/i386-linux-gnu/build_id/libhello_so b/tests/data/debug-info/i386-linux-gnu/build_id/libhello_so similarity index 100% rename from tests/debug-info-data/i386-linux-gnu/build_id/libhello_so rename to tests/data/debug-info/i386-linux-gnu/build_id/libhello_so diff --git a/tests/debug-info-data/i386-linux-gnu/debug_link/libhello_so b/tests/data/debug-info/i386-linux-gnu/debug_link/libhello_so similarity index 100% rename from tests/debug-info-data/i386-linux-gnu/debug_link/libhello_so rename to tests/data/debug-info/i386-linux-gnu/debug_link/libhello_so diff --git a/tests/debug-info-data/i386-linux-gnu/debug_link/libhello_so.debug b/tests/data/debug-info/i386-linux-gnu/debug_link/libhello_so.debug similarity index 100% rename from tests/debug-info-data/i386-linux-gnu/debug_link/libhello_so.debug rename to tests/data/debug-info/i386-linux-gnu/debug_link/libhello_so.debug diff --git a/tests/debug-info-data/i386-linux-gnu/dwarf_full/libhello_so b/tests/data/debug-info/i386-linux-gnu/dwarf_full/libhello_so similarity index 100% rename from tests/debug-info-data/i386-linux-gnu/dwarf_full/libhello_so rename to tests/data/debug-info/i386-linux-gnu/dwarf_full/libhello_so diff --git a/tests/debug-info-data/i386-linux-gnu/elf_only/libhello_so b/tests/data/debug-info/i386-linux-gnu/elf_only/libhello_so similarity index 100% rename from tests/debug-info-data/i386-linux-gnu/elf_only/libhello_so rename to tests/data/debug-info/i386-linux-gnu/elf_only/libhello_so diff --git a/tests/debug-info-data/libhello.c b/tests/data/debug-info/libhello.c similarity index 100% rename from tests/debug-info-data/libhello.c rename to tests/data/debug-info/libhello.c diff --git a/tests/debug-info-data/libhello.h b/tests/data/debug-info/libhello.h similarity index 100% rename from tests/debug-info-data/libhello.h rename to tests/data/debug-info/libhello.h diff --git a/tests/debug-info-data/main.c b/tests/data/debug-info/main.c similarity index 100% rename from tests/debug-info-data/main.c rename to tests/data/debug-info/main.c diff --git a/tests/debug-info-data/powerpc-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug b/tests/data/debug-info/powerpc-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug similarity index 100% rename from tests/debug-info-data/powerpc-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug rename to tests/data/debug-info/powerpc-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug diff --git a/tests/debug-info-data/powerpc-linux-gnu/build_id/libhello_so b/tests/data/debug-info/powerpc-linux-gnu/build_id/libhello_so similarity index 100% rename from tests/debug-info-data/powerpc-linux-gnu/build_id/libhello_so rename to tests/data/debug-info/powerpc-linux-gnu/build_id/libhello_so diff --git a/tests/debug-info-data/powerpc-linux-gnu/debug_link/libhello_so b/tests/data/debug-info/powerpc-linux-gnu/debug_link/libhello_so similarity index 100% rename from tests/debug-info-data/powerpc-linux-gnu/debug_link/libhello_so rename to tests/data/debug-info/powerpc-linux-gnu/debug_link/libhello_so diff --git a/tests/debug-info-data/powerpc-linux-gnu/debug_link/libhello_so.debug b/tests/data/debug-info/powerpc-linux-gnu/debug_link/libhello_so.debug similarity index 100% rename from tests/debug-info-data/powerpc-linux-gnu/debug_link/libhello_so.debug rename to tests/data/debug-info/powerpc-linux-gnu/debug_link/libhello_so.debug diff --git a/tests/debug-info-data/powerpc-linux-gnu/dwarf_full/libhello_so b/tests/data/debug-info/powerpc-linux-gnu/dwarf_full/libhello_so similarity index 100% rename from tests/debug-info-data/powerpc-linux-gnu/dwarf_full/libhello_so rename to tests/data/debug-info/powerpc-linux-gnu/dwarf_full/libhello_so diff --git a/tests/debug-info-data/powerpc-linux-gnu/elf_only/libhello_so b/tests/data/debug-info/powerpc-linux-gnu/elf_only/libhello_so similarity index 100% rename from tests/debug-info-data/powerpc-linux-gnu/elf_only/libhello_so rename to tests/data/debug-info/powerpc-linux-gnu/elf_only/libhello_so diff --git a/tests/debug-info-data/powerpc64le-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug b/tests/data/debug-info/powerpc64le-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug similarity index 100% rename from tests/debug-info-data/powerpc64le-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug rename to tests/data/debug-info/powerpc64le-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug diff --git a/tests/debug-info-data/powerpc64le-linux-gnu/build_id/libhello_so b/tests/data/debug-info/powerpc64le-linux-gnu/build_id/libhello_so similarity index 100% rename from tests/debug-info-data/powerpc64le-linux-gnu/build_id/libhello_so rename to tests/data/debug-info/powerpc64le-linux-gnu/build_id/libhello_so diff --git a/tests/debug-info-data/powerpc64le-linux-gnu/debug_link/libhello_so b/tests/data/debug-info/powerpc64le-linux-gnu/debug_link/libhello_so similarity index 100% rename from tests/debug-info-data/powerpc64le-linux-gnu/debug_link/libhello_so rename to tests/data/debug-info/powerpc64le-linux-gnu/debug_link/libhello_so diff --git a/tests/debug-info-data/powerpc64le-linux-gnu/debug_link/libhello_so.debug b/tests/data/debug-info/powerpc64le-linux-gnu/debug_link/libhello_so.debug similarity index 100% rename from tests/debug-info-data/powerpc64le-linux-gnu/debug_link/libhello_so.debug rename to tests/data/debug-info/powerpc64le-linux-gnu/debug_link/libhello_so.debug diff --git a/tests/debug-info-data/powerpc64le-linux-gnu/dwarf_full/libhello_so b/tests/data/debug-info/powerpc64le-linux-gnu/dwarf_full/libhello_so similarity index 100% rename from tests/debug-info-data/powerpc64le-linux-gnu/dwarf_full/libhello_so rename to tests/data/debug-info/powerpc64le-linux-gnu/dwarf_full/libhello_so diff --git a/tests/debug-info-data/powerpc64le-linux-gnu/elf_only/libhello_so b/tests/data/debug-info/powerpc64le-linux-gnu/elf_only/libhello_so similarity index 100% rename from tests/debug-info-data/powerpc64le-linux-gnu/elf_only/libhello_so rename to tests/data/debug-info/powerpc64le-linux-gnu/elf_only/libhello_so diff --git a/tests/debug-info-data/tp.c b/tests/data/debug-info/tp.c similarity index 100% rename from tests/debug-info-data/tp.c rename to tests/data/debug-info/tp.c diff --git a/tests/debug-info-data/tp.h b/tests/data/debug-info/tp.h similarity index 100% rename from tests/debug-info-data/tp.h rename to tests/data/debug-info/tp.h diff --git a/tests/debug-info-data/trace/metadata b/tests/data/debug-info/trace/metadata similarity index 100% rename from tests/debug-info-data/trace/metadata rename to tests/data/debug-info/trace/metadata diff --git a/tests/debug-info-data/trace/stream_0_0 b/tests/data/debug-info/trace/stream_0_0 similarity index 100% rename from tests/debug-info-data/trace/stream_0_0 rename to tests/data/debug-info/trace/stream_0_0 diff --git a/tests/debug-info-data/x86_64-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug b/tests/data/debug-info/x86_64-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug similarity index 100% rename from tests/debug-info-data/x86_64-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug rename to tests/data/debug-info/x86_64-linux-gnu/build_id/.build-id/cd/d98cdd87f7fe64c13b6daad553987eafd40cbb.debug diff --git a/tests/debug-info-data/x86_64-linux-gnu/build_id/libhello_so b/tests/data/debug-info/x86_64-linux-gnu/build_id/libhello_so similarity index 100% rename from tests/debug-info-data/x86_64-linux-gnu/build_id/libhello_so rename to tests/data/debug-info/x86_64-linux-gnu/build_id/libhello_so diff --git a/tests/debug-info-data/x86_64-linux-gnu/debug_link/libhello_so b/tests/data/debug-info/x86_64-linux-gnu/debug_link/libhello_so similarity index 100% rename from tests/debug-info-data/x86_64-linux-gnu/debug_link/libhello_so rename to tests/data/debug-info/x86_64-linux-gnu/debug_link/libhello_so diff --git a/tests/debug-info-data/x86_64-linux-gnu/debug_link/libhello_so.debug b/tests/data/debug-info/x86_64-linux-gnu/debug_link/libhello_so.debug similarity index 100% rename from tests/debug-info-data/x86_64-linux-gnu/debug_link/libhello_so.debug rename to tests/data/debug-info/x86_64-linux-gnu/debug_link/libhello_so.debug diff --git a/tests/debug-info-data/x86_64-linux-gnu/dwarf_full/libhello_so b/tests/data/debug-info/x86_64-linux-gnu/dwarf_full/libhello_so similarity index 100% rename from tests/debug-info-data/x86_64-linux-gnu/dwarf_full/libhello_so rename to tests/data/debug-info/x86_64-linux-gnu/dwarf_full/libhello_so diff --git a/tests/debug-info-data/x86_64-linux-gnu/elf_only/libhello_so b/tests/data/debug-info/x86_64-linux-gnu/elf_only/libhello_so similarity index 100% rename from tests/debug-info-data/x86_64-linux-gnu/elf_only/libhello_so rename to tests/data/debug-info/x86_64-linux-gnu/elf_only/libhello_so diff --git a/tests/plugins/src.ctf.fs/succeed/trace-simple.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-simple.expect similarity index 100% rename from tests/plugins/src.ctf.fs/succeed/trace-simple.expect rename to tests/data/plugins/src.ctf.fs/succeed/trace-simple.expect diff --git a/tests/plugins/src.ctf.fs/succeed/trace-smalltrace.expect b/tests/data/plugins/src.ctf.fs/succeed/trace-smalltrace.expect similarity index 100% rename from tests/plugins/src.ctf.fs/succeed/trace-smalltrace.expect rename to tests/data/plugins/src.ctf.fs/succeed/trace-smalltrace.expect diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu.in index 9b58d63c..e36379c2 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu.in +++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu.in @@ -23,7 +23,7 @@ NO_SH_TAP=1 curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" -debug_info_data="${BT_SRC_PATH}/tests/debug-info-data/i386-linux-gnu" +debug_info_data="${BT_DEBUG_INFO_PATH}/i386-linux-gnu" "${curdir}/test_bin_info" \ --foo-addr=0x1c8d \ diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu.in index d0948aa6..c37568c0 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu.in +++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu.in @@ -23,7 +23,7 @@ NO_SH_TAP=1 curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" -debug_info_data="${BT_SRC_PATH}/tests/debug-info-data/powerpc-linux-gnu" +debug_info_data="${BT_DEBUG_INFO_PATH}/powerpc-linux-gnu" "${curdir}/test_bin_info" \ --foo-addr=0x23bc \ diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu.in index 5e814157..70e5b2cf 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu.in +++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu.in @@ -23,7 +23,7 @@ NO_SH_TAP=1 curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" -debug_info_data="${BT_SRC_PATH}/tests/debug-info-data/powerpc64le-linux-gnu" +debug_info_data="${BT_DEBUG_INFO_PATH}/powerpc64le-linux-gnu" "${curdir}/test_bin_info" \ --foo-addr=0x2e7c \ diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu.in index 6ed40daf..8a29f287 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu.in +++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu.in @@ -23,7 +23,7 @@ NO_SH_TAP=1 curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" -debug_info_data="${BT_SRC_PATH}/tests/debug-info-data/x86_64-linux-gnu" +debug_info_data="${BT_DEBUG_INFO_PATH}/x86_64-linux-gnu" "${curdir}/test_bin_info" \ --foo-addr=0x2277 \ diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu.in index 4c50ecb9..8794bfac 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu.in +++ b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu.in @@ -23,6 +23,6 @@ NO_SH_TAP=1 curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" -debug_info_data="${BT_SRC_PATH}/tests/debug-info-data/i386-linux-gnu" +debug_info_data="${BT_DEBUG_INFO_PATH}/i386-linux-gnu" "${curdir}/test_dwarf" "$debug_info_data" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu.in index 1a7b7750..15d3a2f6 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu.in +++ b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu.in @@ -23,6 +23,6 @@ NO_SH_TAP=1 curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" -debug_info_data="${BT_SRC_PATH}/tests/debug-info-data/powerpc-linux-gnu" +debug_info_data="${BT_DEBUG_INFO_PATH}/powerpc-linux-gnu" "${curdir}/test_dwarf" "$debug_info_data" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu.in index 0a94ff00..cbb36503 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu.in +++ b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu.in @@ -23,6 +23,6 @@ NO_SH_TAP=1 curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" -debug_info_data="${BT_SRC_PATH}/tests/debug-info-data/powerpc64le-linux-gnu" +debug_info_data="${BT_DEBUG_INFO_PATH}/powerpc64le-linux-gnu" "${curdir}/test_dwarf" "$debug_info_data" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu.in index 9d0c9d88..7b350898 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu.in +++ b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu.in @@ -22,6 +22,6 @@ NO_SH_TAP=1 curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" -debug_info_data="${BT_SRC_PATH}/tests/debug-info-data/x86_64-linux-gnu" +debug_info_data="${BT_DEBUG_INFO_PATH}/x86_64-linux-gnu" "${curdir}/test_dwarf" "$debug_info_data" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.in b/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.in index 5d02aaee..210e01a7 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.in +++ b/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.in @@ -25,7 +25,7 @@ TESTS_UTILS_PYTHON_DIR="${BT_SRC_PATH}/tests/utils/python" TESTRUNNER_PY="${BT_SRC_PATH}/tests/utils/python/testrunner.py" THIS_DIR="${BT_SRC_PATH}/tests/plugins" export BABELTRACE_PLUGIN_PATH="${BT_BUILD_PATH}/src/plugins/utils:${BT_BUILD_PATH}/src/plugins/ctf:${BT_BUILD_PATH}/src/plugins/lttng-utils" -export DEBUG_INFO_DATA_DIR="${BT_SRC_PATH}/tests/debug-info-data" +export BT_DEBUG_INFO_PATH if [ "x${MSYSTEM}" != "x" ]; then export PATH="${BT_BUILD_PATH}/src/lib/.libs:${PATH}" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.py b/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.py index dd27ec9c..f4e6e2e7 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.py +++ b/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.py @@ -7,9 +7,9 @@ import os @unittest.skip('depends on Python bindings, which are broken') class LttngUtilsDebugInfoTestCase(unittest.TestCase): def test_debug_info(self): - debug_info_data_dir = os.environ['DEBUG_INFO_DATA_DIR'] - trace_path = os.path.join(debug_info_data_dir, 'trace') - target_prefix = os.path.join(debug_info_data_dir, '..', '..') + debug_info_data_path = os.environ['BT_DEBUG_INFO_PATH'] + trace_path = os.path.join(debug_info_data_path, 'trace') + target_prefix = os.path.join(debug_info_data_path, '..', '..') src = bt2.ComponentSpec('ctf', 'fs', trace_path) flt = bt2.ComponentSpec('lttng-utils', 'debug-info', { 'target-prefix': target_prefix, diff --git a/tests/plugins/src.ctf.fs/query/test_query_trace_info.py b/tests/plugins/src.ctf.fs/query/test_query_trace_info.py index a026a68e..b3924640 100644 --- a/tests/plugins/src.ctf.fs/query/test_query_trace_info.py +++ b/tests/plugins/src.ctf.fs/query/test_query_trace_info.py @@ -20,7 +20,7 @@ import os import re -test_ctf_traces_path = os.environ['TEST_CTF_TRACES_PATH'] +test_ctf_traces_path = os.environ['BT_CTF_TRACES_PATH'] # Key to sort streams in a predictable order. @@ -149,11 +149,11 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase): self.assertEqual(len(streams), 2) self.assertRegexpMatches( str(streams[0]["port-name"]), - r"^7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf \| 0 \| .*/tests/ctf-traces/intersection/3eventsintersect/test_stream_0$", + r"^7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf \| 0 \| .*/tests/data/ctf-traces/intersection/3eventsintersect/test_stream_0$", ) self.assertRegexpMatches( str(streams[1]["port-name"]), - r"^7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf \| 0 \| .*/tests/ctf-traces/intersection/3eventsintersect/test_stream_1$", + r"^7afe8fbe-79b8-4f6a-bbc7-d0c782e7ddaf \| 0 \| .*/tests/data/ctf-traces/intersection/3eventsintersect/test_stream_1$", ) def test_trace_uuid_no_stream_class_id_no_stream_id(self): @@ -168,7 +168,7 @@ class QueryTraceInfoPortNameTestCase(unittest.TestCase): self.assertEqual(len(streams), 1) self.assertRegexpMatches( str(streams[0]["port-name"]), - r"^2a6422d0-6cee-11e0-8c08-cb07d7b3a564 \| .*/tests/ctf-traces/succeed/succeed1/dummystream$", + r"^2a6422d0-6cee-11e0-8c08-cb07d7b3a564 \| .*/tests/data/ctf-traces/succeed/succeed1/dummystream$", ) diff --git a/tests/plugins/src.ctf.fs/succeed/Makefile.am b/tests/plugins/src.ctf.fs/succeed/Makefile.am index 4a562ccc..88f1bd5e 100644 --- a/tests/plugins/src.ctf.fs/succeed/Makefile.am +++ b/tests/plugins/src.ctf.fs/succeed/Makefile.am @@ -1,10 +1,5 @@ dist_check_SCRIPTS = test_succeed -# Expectation files -EXTRA_DIST = \ - trace-smalltrace.expect \ - trace-simple.expect - # CTF trace generators GEN_TRACE_LDADD = $(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la diff --git a/tests/plugins/src.ctf.fs/succeed/test_succeed.in b/tests/plugins/src.ctf.fs/succeed/test_succeed.in index 74db85a0..a84b80b7 100644 --- a/tests/plugins/src.ctf.fs/succeed/test_succeed.in +++ b/tests/plugins/src.ctf.fs/succeed/test_succeed.in @@ -25,9 +25,9 @@ . "@abs_top_builddir@/tests/utils/diff.sh" this_dir_relative="tests/plugins/src.ctf.fs/succeed" -this_dir_src="$BT_SRC_PATH/$this_dir_relative" +this_dir_src="$BT_SRC_PATH/tests/data/plugins/src.ctf.fs/succeed" this_dir_build="$BT_BUILD_PATH/$this_dir_relative" -succeed_trace_dir="$BT_CTF_TRACES/succeed" +succeed_trace_dir="$BT_CTF_TRACES_PATH/succeed" test_ctf_common_details_args="-p with-trace-name=no,with-stream-name=no" diff --git a/tests/utils/common.sh.in b/tests/utils/common.sh.in index 976ef70e..3f7e2a31 100644 --- a/tests/utils/common.sh.in +++ b/tests/utils/common.sh.in @@ -4,7 +4,8 @@ BT_SRC_PATH="@abs_top_srcdir@" BT_BUILD_PATH="@abs_top_builddir@" BT_BIN="${BT_BUILD_PATH}/src/cli/babeltrace2@EXEEXT@" -BT_CTF_TRACES="${BT_SRC_PATH}/tests/ctf-traces" +BT_CTF_TRACES_PATH="${BT_SRC_PATH}/tests/data/ctf-traces" +BT_DEBUG_INFO_PATH="${BT_SRC_PATH}/tests/data/debug-info" if [ "x${NO_SH_TAP}" = x ]; then . "${BT_SRC_PATH}/tests/utils/tap/tap.sh" diff --git a/tests/utils/test_python_bt2_env.in b/tests/utils/test_python_bt2_env.in index d8e46b54..b4ea36b5 100644 --- a/tests/utils/test_python_bt2_env.in +++ b/tests/utils/test_python_bt2_env.in @@ -30,7 +30,8 @@ NO_SH_TAP=1 export BABELTRACE_PYTHON_BT2_NO_TRACEBACK=1 export TEST_PLUGIN_PLUGINS_PATH="${BT_BUILD_PATH}/src/plugins" export BABELTRACE_PLUGIN_PATH="${BT_BUILD_PATH}/src/plugins/ctf:${BT_BUILD_PATH}/src/plugins/utils:${BT_BUILD_PATH}/src/plugins/text" -export TEST_CTF_TRACES_PATH="${BT_SRC_PATH}/tests/ctf-traces" +export BT_CTF_TRACES_PATH + PYTHON_BUILD_DIR="${BT_BUILD_PATH}/src/bindings/python/bt2/build/build_lib" TESTS_UTILS_PYTHON_DIR="${BT_SRC_PATH}/tests/utils/python" export PYTHONPATH="${PYTHON_BUILD_DIR}:${TESTS_UTILS_PYTHON_DIR}" -- 2.34.1