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

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

diff --git a/tests/cli/convert/test_auto_source_discovery_params b/tests/cli/convert/test_auto_source_discovery_params
index 53a9ecbdada59c2ede7377c6e40ddbd704ad1293..3619a31eec29eb55a330881461321aee33a86075 100755 (executable)
--- 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"
@@ -64,7 +64,7 @@ Stream end
 END
 
 bt_diff_cli "$expected_file" "/dev/null" \
-       convert --plugin-path "${plugin_dir}" \
+       --plugin-path "${plugin_dir}" convert \
        "${dir_ab}" --params 'test-allo="madame"' ${print_test_params} \
        ${details_sink[@]}
 ok "$?" "apply params to two components from one non-option argument"
@@ -91,7 +91,7 @@ Stream end
 END
 
 bt_diff_cli "$expected_file" "/dev/null" \
-       convert --plugin-path "${plugin_dir}" \
+       --plugin-path "${plugin_dir}" convert \
        "${dir_a}" --params 'test-allo="madame"' ${print_test_params} "${dir_b}" --params 'test-bonjour="monsieur"' ${print_test_params} \
        ${details_sink[@]}
 ok "$?" "apply params to two non-option arguments"
@@ -118,7 +118,7 @@ Stream end
 END
 
 bt_diff_cli "$expected_file" "/dev/null" \
-       convert --plugin-path "${plugin_dir}" \
+       --plugin-path "${plugin_dir}" convert \
        "${dir_a}" --params 'test-allo="madame"' ${print_test_params} "${dir_ab}" --params 'test-bonjour="monsieur"' ${print_test_params} \
        ${details_sink[@]}
 ok "$?" "apply params to one component coming from one non-option argument and one component coming from two non-option arguments (1)"
@@ -145,7 +145,7 @@ Stream end
 END
 
 bt_diff_cli "$expected_file" "/dev/null" \
-       convert --plugin-path "${plugin_dir}" \
+       --plugin-path "${plugin_dir}" convert \
        "${dir_ab}" --params 'test-bonjour="madame",test-salut="les amis"' ${print_test_params} "${dir_a}" --params 'test-bonjour="monsieur"' ${print_test_params} \
        ${details_sink[@]}
 ok "$?" "apply params to one component coming from one non-option argument and one component coming from two non-option arguments (2)"