X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Fplugins%2Fsink.text.pretty%2Ftest_enum;fp=tests%2Fplugins%2Fsink.text.pretty%2Ftest_enum;h=1d6b723de1c87eba14d60e1c4182ff5ff50c9fbd;hp=723448b72ea85768ed828866f5a7704892869c29;hb=ffa209addac22ab2fddcd18f42bafaa0410068e4;hpb=75e396f6b20bdf52c76a3c7312e7fb815ac1e5e9 diff --git a/tests/plugins/sink.text.pretty/test_enum b/tests/plugins/sink.text.pretty/test_enum index 723448b7..1d6b723d 100755 --- a/tests/plugins/sink.text.pretty/test_enum +++ b/tests/plugins/sink.text.pretty/test_enum @@ -19,7 +19,6 @@ source "$UTILSSH" data_dir="$BT_TESTS_DATADIR/plugins/sink.text.pretty" temp_stdout_expected_file=$(mktemp -t test_pretty_expected_stdout.XXXXXX) -temp_stderr_expected="/dev/null" plan_tests 31 @@ -37,7 +36,7 @@ function compare_enum_sorted # since Python 3.7). run_python_bt2 "${BT_TESTS_PYTHON_BIN}" "${BT_TESTS_SRCDIR}/utils/python/split_sort_compare.py" \ - "$(cat $expected_file)" "$(cat $actual_file)" + "$(cat "$expected_file")" "$(cat "$actual_file")" } function run_test @@ -46,7 +45,6 @@ function run_test local expected_to_fail="$2" local value="$3" local expected_stdout_file="$4" - local test_text= local actual_stdout_file local actual_stderr_file local ret=0 @@ -77,7 +75,7 @@ function run_test rm -f "$actual_stdout_file" "$actual_stderr_file" - if (($expected_to_fail)); then + if [ "$expected_to_fail" = "1" ]; then isnt $ret 0 "$test_name signed=$enum_signed with value=$value doesn't match as expected" else ok $ret "$test_name signed=$enum_signed with value=$value matches" @@ -266,6 +264,4 @@ test_normal_enum_negative test_bit_flag_enum test_mixed_enum -# Do not `rm` $temp_stderr_expected because it's set to `/dev/null` right now -# and that would print an error. rm -f "$temp_stdout_expected_file"