Re: [PATCH 6/6] perf test: Do not set TEST_SKIP for record subtests

From: Adrian Hunter
Date: Tue Sep 13 2022 - 07:28:14 EST


On 7/09/22 09:46, Namhyung Kim wrote:
> It now has 4 sub tests and one of them should run at least.
> But once TEST_SKIP (= 2) return value is set, it won't be overwritten
> unless there's a failure. I think we should return success when one
> or more tested are skipped but the remaining subtests are passed.
>
> So update the test code not to set the err variable when it skips
> the test.
>
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>

I tend to agree that the perf's default event should work.

Reviewed-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>


> ---
> tools/perf/tests/shell/record.sh | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/tools/perf/tests/shell/record.sh b/tools/perf/tests/shell/record.sh
> index ff66e58f3a26..487981767455 100755
> --- a/tools/perf/tests/shell/record.sh
> +++ b/tools/perf/tests/shell/record.sh
> @@ -72,10 +72,6 @@ test_per_thread() {
> if ! perf record -o /dev/null --quiet ${testprog} 2> /dev/null
> then
> echo "Per-thread record [Skipped event not supported]"
> - if [ $err -ne 1 ]
> - then
> - err=2
> - fi
> return
> fi
> if ! perf record --per-thread ${testopt} -o ${perfdata} ${testprog} 2> /dev/null
> @@ -111,10 +107,6 @@ test_register_capture() {
> if ! perf list | egrep -q 'br_inst_retired.near_call'
> then
> echo "Register capture test [Skipped missing event]"
> - if [ $err -ne 1 ]
> - then
> - err=2
> - fi
> return
> fi
> if ! perf record --intr-regs=\? 2>&1 | egrep -q 'available registers: AX BX CX DX SI DI BP SP IP FLAGS CS SS R8 R9 R10 R11 R12 R13 R14 R15'
> @@ -139,10 +131,6 @@ test_system_wide() {
> if ! perf record -aB --synth=no ${testopt} -o ${perfdata} ${testprog} 2> /dev/null
> then
> echo "System-wide record [Skipped not supported]"
> - if [ $err -ne 1 ]
> - then
> - err=2
> - fi
> return
> fi
> if ! perf report -i ${perfdata} -q | egrep -q ${testsym}