cli: make --plugin-path and --omit-{system,home}-plugin-path global opts

[babeltrace.git] / tests / cli / convert / test_auto_source_discovery_grouping

diff --git a/tests/cli/convert/test_auto_source_discovery_grouping b/tests/cli/convert/test_auto_source_discovery_grouping
index 85f324d843a0b274930c01396598351ca67ae801..53b932a4034fc82aa2d32af24663a91b255b72b9 100755 (executable)
--- 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,12 +44,12 @@ 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)
 
 bt_cli "$stdout_actual_file" "$stderr_actual_file" \
-       convert --plugin-path "${plugin_dir}" "ABCDE" "${trace_dir}" some_other_non_opt \
+       --plugin-path "${plugin_dir}" convert "ABCDE" "${trace_dir}" some_other_non_opt \
        -c sink.text.details --params='with-metadata=false'
 ok "$?" "CLI runs successfully"