lib: decouple variant FC option names from selector FC mapping names

[babeltrace.git] / tests / plugins / sink.ctf.fs / succeed / test_succeed

diff --git a/tests/plugins/sink.ctf.fs/succeed/test_succeed b/tests/plugins/sink.ctf.fs/succeed/test_succeed
index fa5f3751ec9c36e63c977081ead9df98a23aae69..5c2547d6afaf0e35e703e759d992751d6af2df94 100755 (executable)
--- a/tests/plugins/sink.ctf.fs/succeed/test_succeed
+++ b/tests/plugins/sink.ctf.fs/succeed/test_succeed
@@ -36,24 +36,15 @@ source "$UTILSSH"
 this_dir_relative="plugins/sink.ctf.fs/succeed"
 this_dir_build="$BT_TESTS_BUILDDIR/$this_dir_relative"
 expect_dir="$BT_TESTS_DATADIR/$this_dir_relative"
+succeed_traces="$BT_CTF_TRACES_PATH/succeed"
 
-test_ctf_gen_single() {
-       name="$1"
-       temp_gen_trace_dir="$(mktemp -d)"
-       temp_out_trace_dir="$(mktemp -d)"
-
-       diag "Generating trace '$name'"
-
-       if ! "$this_dir_build/gen-trace-$name" "$temp_gen_trace_dir"; then
-               # this is not part of the test itself; it must not fail
-               echo "ERROR: \"$this_dir_build/gen-trace-$name" "$temp_gen_trace_dir\" failed" >&2
-               rm -rf "$temp_gen_trace_dir"
-               rm -rf "$temp_out_trace_dir"
-               exit 1
-       fi
+test_ctf_single() {
+       local name="$1"
+       local in_trace_dir="$2"
+       local temp_out_trace_dir="$(mktemp -d)"
 
        diag "Converting trace '$name' to CTF through 'sink.ctf.fs'"
-       "$BT_TESTS_BT2_BIN" >/dev/null "$temp_gen_trace_dir" -o ctf -w "$temp_out_trace_dir"
+       "$BT_TESTS_BT2_BIN" >/dev/null "$in_trace_dir" -o ctf -w "$temp_out_trace_dir"
        ret=$?
        ok $ret "'sink.ctf.fs' component succeeds with input trace '$name'"
        converted_test_name="Converted trace '$name' gives the expected output"
@@ -61,17 +52,45 @@ test_ctf_gen_single() {
        if [ $ret -eq 0 ]; then
                bt_diff_details_ctf_single "$expect_dir/trace-$name.expect" \
                        "$temp_out_trace_dir" \
-                       "-p" "with-uuid=no,with-trace-name=no,with-stream-name=no"
+                       '-p' 'with-uuid=no,with-trace-name=no,with-stream-name=no'
                ok $? "$converted_test_name"
        else
                fail "$converted_test_name"
        fi
 
-       rm -rf "$temp_gen_trace_dir"
        rm -rf "$temp_out_trace_dir"
 }
 
-plan_tests 4
+test_ctf_existing_single() {
+       local name="$1"
+       local trace_dir="$succeed_traces/$name"
+
+       test_ctf_single "$name" "$trace_dir"
+}
+
+test_ctf_gen_single() {
+       local name="$1"
+       local temp_gen_trace_dir="$(mktemp -d)"
+
+       diag "Generating trace '$name'"
+
+       if ! "$this_dir_build/gen-trace-$name" "$temp_gen_trace_dir"; then
+               # this is not part of the test itself; it must not fail
+               echo "ERROR: \"$this_dir_build/gen-trace-$name" "$temp_gen_trace_dir\" failed" >&2
+               rm -rf "$temp_gen_trace_dir"
+               exit 1
+       fi
+
+       test_ctf_single "$name" "$temp_gen_trace_dir"
+       rm -rf "$temp_gen_trace_dir"
+}
+
+plan_tests 14
 
 test_ctf_gen_single float
 test_ctf_gen_single double
+test_ctf_existing_single meta-variant-no-underscore
+test_ctf_existing_single meta-variant-one-underscore
+test_ctf_existing_single meta-variant-reserved-keywords
+test_ctf_existing_single meta-variant-same-with-underscore
+test_ctf_existing_single meta-variant-two-underscores