perf test: test_intel_pt.sh: Fix return checking
authorAdrian Hunter <adrian.hunter@intel.com>
Mon, 12 Sep 2022 08:34:09 +0000 (11:34 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 4 Oct 2022 11:55:23 +0000 (08:55 -0300)
The use of set -e will cause a function that returns non-zero to terminate
the script unless the result is consumed by || for example. That is OK if
there is only 1 test function, but not if there are more. Prepare for more
by using ||.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/r/20220912083412.7058-9-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/tests/shell/test_intel_pt.sh

index 075b780fe9ed71c46ce7fc78f5f3bc78c95680dd..7d2f3136ce19a1c48c2270bdd1308cf94f38ea8d 100755 (executable)
@@ -72,11 +72,11 @@ count_result()
                return
        fi
        err_cnt=$((err_cnt + 1))
+       ret=0
 }
 
-test_system_wide_side_band
-
-count_result $?
+ret=0
+test_system_wide_side_band || ret=$? ; count_result $ret
 
 cleanup