From a83410cd12c9acfe79443782e7a5311a6dd6ca59 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 9 Aug 2019 17:57:56 -0400 Subject: [PATCH] tests: move auto source discovery test artifacts These test artifacts will soon be used to test the auto source discovery feature in the Python bindings, so move them out of the `cli` directory. Change-Id: Ia6763a42657c988442436e088fbf0e96de5baf49 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/1865 Reviewed-by: Philippe Proulx Tested-by: jenkins --- tests/cli/convert/test_auto_source_discovery_grouping | 4 ++-- tests/cli/convert/test_auto_source_discovery_log_level | 2 +- tests/cli/convert/test_auto_source_discovery_params | 2 +- .../grouping}/bt_plugin_test.py | 0 .../grouping}/traces/aaa1 | 0 .../grouping}/traces/aaa2 | 0 .../grouping}/traces/aaa3 | 0 .../grouping}/traces/bbb1 | 0 .../grouping}/traces/bbb2 | 0 .../grouping}/traces/ccc1 | 0 .../grouping}/traces/ccc2 | 0 .../grouping}/traces/ccc3 | 0 .../grouping}/traces/ccc4 | 0 .../grouping}/traces/some-dir/aaa10 | 0 .../params-log-level}/bt_plugin_test.py | 0 .../params-log-level}/dir-a/aaa | 0 .../params-log-level}/dir-ab/aaa | 0 .../params-log-level}/dir-ab/bbb | 0 .../params-log-level}/dir-b/bbb | 0 .../stdout.expect => auto-source-discovery-grouping.expect} | 0 20 files changed, 4 insertions(+), 4 deletions(-) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/bt_plugin_test.py (100%) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/traces/aaa1 (100%) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/traces/aaa2 (100%) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/traces/aaa3 (100%) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/traces/bbb1 (100%) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/traces/bbb2 (100%) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/traces/ccc1 (100%) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/traces/ccc2 (100%) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/traces/ccc3 (100%) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/traces/ccc4 (100%) rename tests/data/{cli/convert/auto-source-discovery-grouping => auto-source-discovery/grouping}/traces/some-dir/aaa10 (100%) rename tests/data/{cli/convert/auto-source-discovery-params-log-level => auto-source-discovery/params-log-level}/bt_plugin_test.py (100%) rename tests/data/{cli/convert/auto-source-discovery-params-log-level => auto-source-discovery/params-log-level}/dir-a/aaa (100%) rename tests/data/{cli/convert/auto-source-discovery-params-log-level => auto-source-discovery/params-log-level}/dir-ab/aaa (100%) rename tests/data/{cli/convert/auto-source-discovery-params-log-level => auto-source-discovery/params-log-level}/dir-ab/bbb (100%) rename tests/data/{cli/convert/auto-source-discovery-params-log-level => auto-source-discovery/params-log-level}/dir-b/bbb (100%) rename tests/data/cli/convert/{auto-source-discovery-grouping/stdout.expect => auto-source-discovery-grouping.expect} (100%) diff --git a/tests/cli/convert/test_auto_source_discovery_grouping b/tests/cli/convert/test_auto_source_discovery_grouping index 85f324d8..85e9f8fd 100755 --- a/tests/cli/convert/test_auto_source_discovery_grouping +++ b/tests/cli/convert/test_auto_source_discovery_grouping @@ -30,7 +30,7 @@ NUM_TESTS=3 plan_tests $NUM_TESTS -data_dir="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-grouping" +data_dir="${BT_TESTS_DATADIR}/auto-source-discovery/grouping" plugin_dir="${data_dir}" trace_dir="${data_dir}/traces" @@ -44,7 +44,7 @@ else dir_sep='/' fi -stdout_expected_file="${data_dir}/stdout.expect" +stdout_expected_file="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-grouping.expect" stdout_actual_file=$(mktemp -t stdout-actual.XXXXXX) stderr_actual_file=$(mktemp -t actual-stderr.XXXXXX) diff --git a/tests/cli/convert/test_auto_source_discovery_log_level b/tests/cli/convert/test_auto_source_discovery_log_level index 5e79b013..2ffb4f8f 100755 --- a/tests/cli/convert/test_auto_source_discovery_log_level +++ b/tests/cli/convert/test_auto_source_discovery_log_level @@ -31,7 +31,7 @@ NUM_TESTS=4 plan_tests $NUM_TESTS -data_dir="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-params-log-level" +data_dir="${BT_TESTS_DATADIR}/auto-source-discovery/params-log-level" plugin_dir="${data_dir}" dir_a="${data_dir}/dir-a" dir_b="${data_dir}/dir-b" diff --git a/tests/cli/convert/test_auto_source_discovery_params b/tests/cli/convert/test_auto_source_discovery_params index 53a9ecbd..01123658 100755 --- a/tests/cli/convert/test_auto_source_discovery_params +++ b/tests/cli/convert/test_auto_source_discovery_params @@ -31,7 +31,7 @@ NUM_TESTS=4 plan_tests $NUM_TESTS -data_dir="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-params-log-level" +data_dir="${BT_TESTS_DATADIR}/auto-source-discovery/params-log-level" plugin_dir="${data_dir}" dir_a="${data_dir}/dir-a" dir_b="${data_dir}/dir-b" diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/bt_plugin_test.py b/tests/data/auto-source-discovery/grouping/bt_plugin_test.py similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/bt_plugin_test.py rename to tests/data/auto-source-discovery/grouping/bt_plugin_test.py diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa1 b/tests/data/auto-source-discovery/grouping/traces/aaa1 similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa1 rename to tests/data/auto-source-discovery/grouping/traces/aaa1 diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa2 b/tests/data/auto-source-discovery/grouping/traces/aaa2 similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa2 rename to tests/data/auto-source-discovery/grouping/traces/aaa2 diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa3 b/tests/data/auto-source-discovery/grouping/traces/aaa3 similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa3 rename to tests/data/auto-source-discovery/grouping/traces/aaa3 diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/traces/bbb1 b/tests/data/auto-source-discovery/grouping/traces/bbb1 similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/traces/bbb1 rename to tests/data/auto-source-discovery/grouping/traces/bbb1 diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/traces/bbb2 b/tests/data/auto-source-discovery/grouping/traces/bbb2 similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/traces/bbb2 rename to tests/data/auto-source-discovery/grouping/traces/bbb2 diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc1 b/tests/data/auto-source-discovery/grouping/traces/ccc1 similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc1 rename to tests/data/auto-source-discovery/grouping/traces/ccc1 diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc2 b/tests/data/auto-source-discovery/grouping/traces/ccc2 similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc2 rename to tests/data/auto-source-discovery/grouping/traces/ccc2 diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc3 b/tests/data/auto-source-discovery/grouping/traces/ccc3 similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc3 rename to tests/data/auto-source-discovery/grouping/traces/ccc3 diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc4 b/tests/data/auto-source-discovery/grouping/traces/ccc4 similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc4 rename to tests/data/auto-source-discovery/grouping/traces/ccc4 diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/traces/some-dir/aaa10 b/tests/data/auto-source-discovery/grouping/traces/some-dir/aaa10 similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/traces/some-dir/aaa10 rename to tests/data/auto-source-discovery/grouping/traces/some-dir/aaa10 diff --git a/tests/data/cli/convert/auto-source-discovery-params-log-level/bt_plugin_test.py b/tests/data/auto-source-discovery/params-log-level/bt_plugin_test.py similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-params-log-level/bt_plugin_test.py rename to tests/data/auto-source-discovery/params-log-level/bt_plugin_test.py diff --git a/tests/data/cli/convert/auto-source-discovery-params-log-level/dir-a/aaa b/tests/data/auto-source-discovery/params-log-level/dir-a/aaa similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-params-log-level/dir-a/aaa rename to tests/data/auto-source-discovery/params-log-level/dir-a/aaa diff --git a/tests/data/cli/convert/auto-source-discovery-params-log-level/dir-ab/aaa b/tests/data/auto-source-discovery/params-log-level/dir-ab/aaa similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-params-log-level/dir-ab/aaa rename to tests/data/auto-source-discovery/params-log-level/dir-ab/aaa diff --git a/tests/data/cli/convert/auto-source-discovery-params-log-level/dir-ab/bbb b/tests/data/auto-source-discovery/params-log-level/dir-ab/bbb similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-params-log-level/dir-ab/bbb rename to tests/data/auto-source-discovery/params-log-level/dir-ab/bbb diff --git a/tests/data/cli/convert/auto-source-discovery-params-log-level/dir-b/bbb b/tests/data/auto-source-discovery/params-log-level/dir-b/bbb similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-params-log-level/dir-b/bbb rename to tests/data/auto-source-discovery/params-log-level/dir-b/bbb diff --git a/tests/data/cli/convert/auto-source-discovery-grouping/stdout.expect b/tests/data/cli/convert/auto-source-discovery-grouping.expect similarity index 100% rename from tests/data/cli/convert/auto-source-discovery-grouping/stdout.expect rename to tests/data/cli/convert/auto-source-discovery-grouping.expect -- 2.34.1