Faithful re-implementations of the four Perl test helpers in tools/perf/tests/shell/common/: - check_all_patterns_found.pl - check_no_patterns_found.pl - check_all_lines_matched.pl - check_errors_whitelisted.pl
Same CLI, same output, same exit codes. All use only the Python standard library. TESTLOG_VERBOSITY and TESTLOG_ERR_MSG_MAX_LINES environment handling is preserved. Update all 37 call sites across base_probe/ and base_report/ to invoke the .py versions. Update Makefile.perf's install-tests target to install *.py files (in addition to *.sh) from tests/shell/common/. Remove the four old .pl files. All four were verified byte-for-byte identical to their Perl counterparts on synthetic inputs. Signed-off-by: Breno Rodrigues Alves <[email protected]> --- tools/perf/Makefile.perf | 2 +- .../base_probe/test_adding_blacklisted.sh | 6 +- .../shell/base_probe/test_adding_kernel.sh | 44 +++++++-------- .../perf/tests/shell/base_probe/test_basic.sh | 12 ++-- .../shell/base_probe/test_invalid_options.sh | 4 +- tools/perf/tests/shell/base_report/setup.sh | 4 +- .../tests/shell/base_report/test_basic.sh | 54 +++++++++--------- .../shell/common/check_all_lines_matched.pl | 39 ------------- .../shell/common/check_all_lines_matched.py | 45 +++++++++++++++ .../shell/common/check_all_patterns_found.pl | 34 ------------ .../shell/common/check_all_patterns_found.py | 35 ++++++++++++ .../shell/common/check_errors_whitelisted.pl | 51 ----------------- .../shell/common/check_errors_whitelisted.py | 55 +++++++++++++++++++ .../shell/common/check_no_patterns_found.pl | 34 ------------ .../shell/common/check_no_patterns_found.py | 35 ++++++++++++ 15 files changed, 233 insertions(+), 221 deletions(-) delete mode 100755 tools/perf/tests/shell/common/check_all_lines_matched.pl create mode 100755 tools/perf/tests/shell/common/check_all_lines_matched.py delete mode 100755 tools/perf/tests/shell/common/check_all_patterns_found.pl create mode 100755 tools/perf/tests/shell/common/check_all_patterns_found.py delete mode 100755 tools/perf/tests/shell/common/check_errors_whitelisted.pl create mode 100755 tools/perf/tests/shell/common/check_errors_whitelisted.py delete mode 100755 tools/perf/tests/shell/common/check_no_patterns_found.pl create mode 100755 tools/perf/tests/shell/common/check_no_patterns_found.py diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 29cfd44c4..c9120eab6 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -885,7 +885,7 @@ install-tests: all install-gtk $(INSTALL) tests/shell/lib/*.py -m 644 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/common'; \ $(INSTALL) tests/shell/common/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/common'; \ - $(INSTALL) tests/shell/common/*.pl '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/common'; \ + $(INSTALL) tests/shell/common/*.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/common'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/base_probe'; \ $(INSTALL) tests/shell/base_probe/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/base_probe'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/base_report'; \ diff --git a/tools/perf/tests/shell/base_probe/test_adding_blacklisted.sh b/tools/perf/tests/shell/base_probe/test_adding_blacklisted.sh index f74aab5c5..867545a62 100755 --- a/tools/perf/tests/shell/base_probe/test_adding_blacklisted.sh +++ b/tools/perf/tests/shell/base_probe/test_adding_blacklisted.sh @@ -54,7 +54,7 @@ for BLACKFUNC in $BLACKFUNC_LIST; do PERF_EXIT_CODE=$? # check for bad DWARF polluting the result - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "$REGEX_MISSING_DECL_LINE" >/dev/null < $LOGS_DIR/adding_blacklisted.err if [ $? -eq 0 ]; then @@ -75,7 +75,7 @@ for BLACKFUNC in $BLACKFUNC_LIST; do fi fi else - "$DIR_PATH/../common/check_all_lines_matched.pl" \ + "$DIR_PATH/../common/check_all_lines_matched.py" \ "$REGEX_SKIP_MESSAGE" "$REGEX_NOT_FOUND_MESSAGE" \ "$REGEX_ERROR_MESSAGE" "$REGEX_SCOPE_FAIL" \ "$REGEX_INVALID_ARGUMENT" "$REGEX_SYMBOL_FAIL" \ @@ -100,7 +100,7 @@ fi $CMD_PERF list probe:\* > $LOGS_DIR/adding_blacklisted_list.log PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_lines_matched.pl" \ +"$DIR_PATH/../common/check_all_lines_matched.py" \ "$RE_LINE_EMPTY" "List of pre-defined events" "Metric Groups:" \ < $LOGS_DIR/adding_blacklisted_list.log CHECK_EXIT_CODE=$? diff --git a/tools/perf/tests/shell/base_probe/test_adding_kernel.sh b/tools/perf/tests/shell/base_probe/test_adding_kernel.sh index 555a825d5..3e12e5c38 100755 --- a/tools/perf/tests/shell/base_probe/test_adding_kernel.sh +++ b/tools/perf/tests/shell/base_probe/test_adding_kernel.sh @@ -45,7 +45,7 @@ for opt in "" "-a" "--add"; do $CMD_PERF probe $opt $TEST_PROBE 2> $LOGS_DIR/adding_kernel_add$opt.err PERF_EXIT_CODE=$? - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "Added new events?:" "probe:$TEST_PROBE" "on $TEST_PROBE" \ < $LOGS_DIR/adding_kernel_add$opt.err CHECK_EXIT_CODE=$? @@ -61,7 +61,7 @@ done $CMD_PERF list probe:\* > $LOGS_DIR/adding_kernel_list.log PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_lines_matched.pl" \ +"$DIR_PATH/../common/check_all_lines_matched.py" \ "$RE_LINE_EMPTY" "List of pre-defined events" \ "probe:${TEST_PROBE}(?:_\d+)?\s+\[Tracepoint event\]" \ "Metric Groups:" < $LOGS_DIR/adding_kernel_list.log @@ -77,7 +77,7 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "listing added probe :: perf list $CMD_PERF probe -l > $LOGS_DIR/adding_kernel_list-l.log PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "\s*probe:${TEST_PROBE}(?:_\d+)?\s+\(on ${TEST_PROBE}(?:[:\+]$RE_NUMBER_HEX)?@.+\)" \ < $LOGS_DIR/adding_kernel_list-l.log CHECK_EXIT_CODE=$? @@ -101,11 +101,11 @@ REGEX_STAT_VALUES="\s*\d+\s+probe:$TEST_PROBE" # the value should be greater than 1 REGEX_STAT_VALUE_NONZERO="\s*[1-9][0-9]*\s+probe:$TEST_PROBE" REGEX_STAT_TIME="\s*$RE_NUMBER\s+seconds (?:time elapsed|user|sys)" -"$DIR_PATH/../common/check_all_lines_matched.pl" \ +"$DIR_PATH/../common/check_all_lines_matched.py" \ "$REGEX_STAT_HEADER" "$REGEX_STAT_VALUES" "$REGEX_STAT_TIME" \ "$RE_LINE_COMMENT" "$RE_LINE_EMPTY" < $LOGS_DIR/adding_kernel_using_probe.log CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "$REGEX_STAT_HEADER" "$REGEX_STAT_VALUE_NONZERO" "$REGEX_STAT_TIME" \ < $LOGS_DIR/adding_kernel_using_probe.log (( CHECK_EXIT_CODE += $? )) @@ -120,7 +120,7 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "using added probe" $CMD_PERF probe -d $TEST_PROBE\* 2> $LOGS_DIR/adding_kernel_removing.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_lines_matched.pl" \ +"$DIR_PATH/../common/check_all_lines_matched.py" \ "Removed event: probe:$TEST_PROBE" < $LOGS_DIR/adding_kernel_removing.err CHECK_EXIT_CODE=$? @@ -134,7 +134,7 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "deleting added probe" $CMD_PERF list probe:\* > $LOGS_DIR/adding_kernel_list_removed.log PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_lines_matched.pl" \ +"$DIR_PATH/../common/check_all_lines_matched.py" \ "$RE_LINE_EMPTY" "List of pre-defined events" "Metric Groups:" \ < $LOGS_DIR/adding_kernel_list_removed.log CHECK_EXIT_CODE=$? @@ -150,7 +150,7 @@ $CMD_PERF probe -n --add $TEST_PROBE 2> $LOGS_DIR/adding_kernel_dryrun.err PERF_EXIT_CODE=$? # check for the output (should be the same as usual) -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "Added new events?:" "probe:$TEST_PROBE" "on $TEST_PROBE" \ < $LOGS_DIR/adding_kernel_dryrun.err CHECK_EXIT_CODE=$? @@ -169,7 +169,7 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "dry run :: adding probe" $CMD_PERF probe --add $TEST_PROBE 2> $LOGS_DIR/adding_kernel_forceadd_01.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "Added new events?:" "probe:$TEST_PROBE" "on $TEST_PROBE" \ < $LOGS_DIR/adding_kernel_forceadd_01.err CHECK_EXIT_CODE=$? @@ -181,7 +181,7 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "force-adding probes :: first pro ! $CMD_PERF probe --add $TEST_PROBE 2> $LOGS_DIR/adding_kernel_forceadd_02.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "Error: event \"$TEST_PROBE\" already exists." \ "Error: Failed to add events." < $LOGS_DIR/adding_kernel_forceadd_02.err CHECK_EXIT_CODE=$? @@ -194,7 +194,7 @@ NO_OF_PROBES=`$CMD_PERF probe -l $TEST_PROBE| wc -l` $CMD_PERF probe --force --add $TEST_PROBE 2> $LOGS_DIR/adding_kernel_forceadd_03.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "Added new events?:" "probe:${TEST_PROBE}_${NO_OF_PROBES}" \ "on $TEST_PROBE" < $LOGS_DIR/adding_kernel_forceadd_03.err CHECK_EXIT_CODE=$? @@ -210,7 +210,7 @@ $CMD_PERF stat -e probe:$TEST_PROBE -e probe:${TEST_PROBE}_${NO_OF_PROBES} -x';' PERF_EXIT_CODE=$? REGEX_LINE="$RE_NUMBER;+probe:${TEST_PROBE}_?(?:$NO_OF_PROBES)?;$RE_NUMBER;$RE_NUMBER" -"$DIR_PATH/../common/check_all_lines_matched.pl" \ +"$DIR_PATH/../common/check_all_lines_matched.py" \ "$REGEX_LINE" "$RE_LINE_EMPTY" "$RE_LINE_COMMENT" \ < $LOGS_DIR/adding_kernel_using_two.log CHECK_EXIT_CODE=$? @@ -230,7 +230,7 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "using doubled probe" $CMD_PERF probe --del \* 2> $LOGS_DIR/adding_kernel_removing_wildcard.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_lines_matched.pl" \ +"$DIR_PATH/../common/check_all_lines_matched.py" \ "Removed event: probe:$TEST_PROBE" \ "Removed event: probe:${TEST_PROBE}_1" < $LOGS_DIR/adding_kernel_removing_wildcard.err CHECK_EXIT_CODE=$? @@ -244,7 +244,7 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "removing multiple probes" $CMD_PERF probe -nf --max-probes=512 -a 'vfs_* $params' 2> $LOGS_DIR/adding_kernel_adding_wildcard.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "probe:vfs_mknod" "probe:vfs_create" "probe:vfs_rmdir" \ "probe:vfs_link" "probe:vfs_write" < $LOGS_DIR/adding_kernel_adding_wildcard.err CHECK_EXIT_CODE=$? @@ -269,21 +269,21 @@ test $PERF_EXIT_CODE -ne 139 -a $PERF_EXIT_CODE -ne 0 PERF_EXIT_CODE=$? # check that the error message is reasonable -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "Failed to find" \ "somenonexistingrandomstuffwhichisalsoprettylongorevenlongertoexceed64" \ < $LOGS_DIR/adding_kernel_nonexisting.err CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "in this function|at this address" "Error" "Failed to add events" \ < $LOGS_DIR/adding_kernel_nonexisting.err (( CHECK_EXIT_CODE += $? )) -"$DIR_PATH/../common/check_all_lines_matched.pl" \ +"$DIR_PATH/../common/check_all_lines_matched.py" \ "Failed to find" "Error" "Probe point .+ not found" "optimized out" \ "Use.+\-\-range option to show.+location range" \ < $LOGS_DIR/adding_kernel_nonexisting.err (( CHECK_EXIT_CODE += $? )) -"$DIR_PATH/../common/check_no_patterns_found.pl" \ +"$DIR_PATH/../common/check_no_patterns_found.py" \ "$RE_SEGFAULT" < $LOGS_DIR/adding_kernel_nonexisting.err (( CHECK_EXIT_CODE += $? )) @@ -302,7 +302,7 @@ fi $CMD_PERF probe --add "$TEST_PROBE%return \$retval" 2> $LOGS_DIR/adding_kernel_func_retval_add.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "Added new events?:" "probe:$TEST_PROBE" \ "on $TEST_PROBE%return with \\\$retval" \ < $LOGS_DIR/adding_kernel_func_retval_add.err @@ -315,7 +315,7 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "function with retval :: add" $CMD_PERF record -e probe:$TEST_PROBE\* -o $CURRENT_TEST_DIR/perf.data -- cat /proc/cpuinfo > /dev/null 2> $LOGS_DIR/adding_kernel_func_retval_record.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "$RE_LINE_RECORD1" "$RE_LINE_RECORD2" \ < $LOGS_DIR/adding_kernel_func_retval_record.err CHECK_EXIT_CODE=$? @@ -328,10 +328,10 @@ $CMD_PERF script -i $CURRENT_TEST_DIR/perf.data > $LOGS_DIR/adding_kernel_func_r PERF_EXIT_CODE=$? REGEX_SCRIPT_LINE="\s*cat\s+$RE_NUMBER\s+\[$RE_NUMBER\]\s+$RE_NUMBER:\s+probe:$TEST_PROBE\w*:\s+\($RE_NUMBER_HEX\s+<\-\s+$RE_NUMBER_HEX\)\s+arg1=$RE_NUMBER_HEX" -"$DIR_PATH/../common/check_all_lines_matched.pl" \ +"$DIR_PATH/../common/check_all_lines_matched.py" \ "$REGEX_SCRIPT_LINE" < $LOGS_DIR/adding_kernel_func_retval_script.log CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "$REGEX_SCRIPT_LINE" < $LOGS_DIR/adding_kernel_func_retval_script.log (( CHECK_EXIT_CODE += $? )) diff --git a/tools/perf/tests/shell/base_probe/test_basic.sh b/tools/perf/tests/shell/base_probe/test_basic.sh index 162838ddc..a702be734 100755 --- a/tools/perf/tests/shell/base_probe/test_basic.sh +++ b/tools/perf/tests/shell/base_probe/test_basic.sh @@ -31,24 +31,24 @@ if [ "$PARAM_GENERAL_HELP_TEXT_CHECK" = "y" ]; then $CMD_PERF probe --help > $LOGS_DIR/basic_helpmsg.log 2> $LOGS_DIR/basic_helpmsg.err PERF_EXIT_CODE=$? - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "PERF-PROBE" "NAME" "SYNOPSIS" "DESCRIPTION" "OPTIONS" \ "PROBE\s+SYNTAX" "PROBE\s+ARGUMENT" "LINE\s+SYNTAX" \ < $LOGS_DIR/basic_helpmsg.log CHECK_EXIT_CODE=$? - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "LAZY\s+MATCHING" "FILTER\s+PATTERN" "EXAMPLES" "SEE\s+ALSO" \ < $LOGS_DIR/basic_helpmsg.log (( CHECK_EXIT_CODE += $? )) - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "vmlinux" "module=" "source=" "verbose" "quiet" "add=" "del=" \ "list.*EVENT" "line=" "vars=" "externs" < $LOGS_DIR/basic_helpmsg.log (( CHECK_EXIT_CODE += $? )) - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "no-inlines" "funcs.*FILTER" "filter=FILTER" "force" "dry-run" \ "max-probes" "exec=" "demangle-kernel" < $LOGS_DIR/basic_helpmsg.log (( CHECK_EXIT_CODE += $? )) - "$DIR_PATH/../common/check_no_patterns_found.pl" \ + "$DIR_PATH/../common/check_no_patterns_found.py" \ "No manual entry for" < $LOGS_DIR/basic_helpmsg.err (( CHECK_EXIT_CODE += $? )) @@ -64,7 +64,7 @@ fi # without any args perf-probe should print usage $CMD_PERF probe 2> $LOGS_DIR/basic_usage.log > /dev/null -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "[Uu]sage" "perf probe" "verbose" "quiet" "add" "del" "force" \ "line" "vars" "externs" "range" < $LOGS_DIR/basic_usage.log CHECK_EXIT_CODE=$? diff --git a/tools/perf/tests/shell/base_probe/test_invalid_options.sh b/tools/perf/tests/shell/base_probe/test_invalid_options.sh index 44a3ae014..d88bb7ec5 100755 --- a/tools/perf/tests/shell/base_probe/test_invalid_options.sh +++ b/tools/perf/tests/shell/base_probe/test_invalid_options.sh @@ -34,7 +34,7 @@ for opt in '-a' '-d' '-L' '-V'; do ! $CMD_PERF probe $opt 2> $LOGS_DIR/invalid_options_missing_argument$opt.err PERF_EXIT_CODE=$? - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "Error: switch .* requires a value" \ < $LOGS_DIR/invalid_options_missing_argument$opt.err CHECK_EXIT_CODE=$? @@ -69,7 +69,7 @@ for opt in '-a xxx -d xxx' '-a xxx -L foo' '-a xxx -V foo' '-a xxx -l' '-a xxx - ! $CMD_PERF probe $opt > /dev/null 2> $LOGS_DIR/aux.log PERF_EXIT_CODE=$? - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "Error: switch .+ cannot be used with switch .+" < $LOGS_DIR/aux.log CHECK_EXIT_CODE=$? diff --git a/tools/perf/tests/shell/base_report/setup.sh b/tools/perf/tests/shell/base_report/setup.sh index bb49b0fab..10fe4b553 100755 --- a/tools/perf/tests/shell/base_report/setup.sh +++ b/tools/perf/tests/shell/base_report/setup.sh @@ -26,7 +26,7 @@ SW_EVENT="cpu-clock" $CMD_PERF record -asdg -e $SW_EVENT -o $CURRENT_TEST_DIR/perf.data -- $CMD_LONGER_SLEEP 2> $LOGS_DIR/setup.log PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "$RE_LINE_RECORD1" "$RE_LINE_RECORD2" < $LOGS_DIR/setup.log CHECK_EXIT_CODE=$? @@ -41,7 +41,7 @@ echo ================== cat $LOGS_DIR/setup-latency.log echo ================== -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "$RE_LINE_RECORD1" "$RE_LINE_RECORD2" < $LOGS_DIR/setup-latency.log CHECK_EXIT_CODE=$? diff --git a/tools/perf/tests/shell/base_report/test_basic.sh b/tools/perf/tests/shell/base_report/test_basic.sh index 0dfe7e5fd..9bfec0068 100755 --- a/tools/perf/tests/shell/base_report/test_basic.sh +++ b/tools/perf/tests/shell/base_report/test_basic.sh @@ -26,36 +26,36 @@ if [ "$PARAM_GENERAL_HELP_TEXT_CHECK" = "y" ]; then $CMD_PERF report --help > $LOGS_DIR/basic_helpmsg.log 2> $LOGS_DIR/basic_helpmsg.err PERF_EXIT_CODE=$? - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "PERF-REPORT" "NAME" "SYNOPSIS" "DESCRIPTION" "OPTIONS" \ "OVERHEAD\s+CALCULATION" "SEE ALSO" < $LOGS_DIR/basic_helpmsg.log CHECK_EXIT_CODE=$? - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "input" "verbose" "show-nr-samples" "show-cpu-utilization" \ "threads" "comms" "pid" "tid" "dsos" "symbols" "symbol-filter" \ < $LOGS_DIR/basic_helpmsg.log (( CHECK_EXIT_CODE += $? )) - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "hide-unresolved" "sort" "fields" "parent" "exclude-other" \ "column-widths" "field-separator" "dump-raw-trace" "children" \ < $LOGS_DIR/basic_helpmsg.log (( CHECK_EXIT_CODE += $? )) - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "call-graph" "max-stack" "inverted" "ignore-callees" "pretty" \ "stdio" "tui" "gtk" "vmlinux" "kallsyms" "modules" \ < $LOGS_DIR/basic_helpmsg.log (( CHECK_EXIT_CODE += $? )) - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "force" "symfs" "cpu" "disassembler-style" "source" "asm-raw" \ "show-total-period" "show-info" "branch-stack" "group" \ < $LOGS_DIR/basic_helpmsg.log (( CHECK_EXIT_CODE += $? )) - "$DIR_PATH/../common/check_all_patterns_found.pl" \ + "$DIR_PATH/../common/check_all_patterns_found.py" \ "branch-history" "objdump" "demangle" "percent-limit" "percentage" \ "header" "itrace" "full-source-path" "show-ref-call-graph" \ < $LOGS_DIR/basic_helpmsg.log (( CHECK_EXIT_CODE += $? )) - "$DIR_PATH/../common/check_no_patterns_found.pl" \ + "$DIR_PATH/../common/check_no_patterns_found.py" \ "No manual entry for" < $LOGS_DIR/basic_helpmsg.err (( CHECK_EXIT_CODE += $? )) @@ -76,11 +76,11 @@ REGEX_LOST_SAMPLES_INFO="#\s*Total Lost Samples:\s+$RE_NUMBER" REGEX_SAMPLES_INFO="#\s*Samples:\s+(?:$RE_NUMBER)\w?\s+of\s+event\s+'$RE_EVENT_ANY'" REGEX_LINES_HEADER="#\s*Children\s+Self\s+Command\s+Shared Object\s+Symbol" REGEX_LINES="\s*$RE_NUMBER%\s+$RE_NUMBER%\s+\S+\s+\[kernel\.(?:vmlinux)|(?:kallsyms)\]\s+\[[k\.]\]\s+\w+" -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "$REGEX_LOST_SAMPLES_INFO" "$REGEX_SAMPLES_INFO" \ "$REGEX_LINES_HEADER" "$REGEX_LINES" < $LOGS_DIR/basic_basic.log CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_errors_whitelisted.pl" \ +"$DIR_PATH/../common/check_errors_whitelisted.py" \ "$DIR_PATH/stderr-whitelist.txt" < $LOGS_DIR/basic_basic.err (( CHECK_EXIT_CODE += $? )) @@ -96,10 +96,10 @@ PERF_EXIT_CODE=$? REGEX_LINES_HEADER="#\s*Children\s+Self\s+Samples\s+Command\s+Shared Object\s+Symbol" REGEX_LINES="\s*$RE_NUMBER%\s+$RE_NUMBER%\s+$RE_NUMBER\s+\S+\s+\[kernel\.(?:vmlinux)|(?:kallsyms)\]\s+\[[k\.]\]\s+\w+" -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "$REGEX_LINES_HEADER" "$REGEX_LINES" < $LOGS_DIR/basic_nrsamples.log CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_errors_whitelisted.pl" \ +"$DIR_PATH/../common/check_errors_whitelisted.py" \ "$DIR_PATH/stderr-whitelist.txt" < $LOGS_DIR/basic_nrsamples.err (( CHECK_EXIT_CODE += $? )) @@ -122,7 +122,7 @@ REGEX_LINE_CPUS_ONLINE="#\s+nrcpus online\s*:\s*$MY_CPUS_ONLINE" REGEX_LINE_CPUS_AVAIL="#\s+nrcpus avail\s*:\s*$MY_CPUS_AVAILABLE" # disable precise check for "nrcpus avail" in BASIC runmode test $PERFTOOL_TESTSUITE_RUNMODE -lt $RUNMODE_STANDARD && REGEX_LINE_CPUS_AVAIL="#\s+nrcpus avail\s*:\s*$RE_NUMBER" -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "$REGEX_LINE_TIMESTAMP" "$REGEX_LINE_HOSTNAME" "$REGEX_LINE_KERNEL" \ "$REGEX_LINE_PERF" "$REGEX_LINE_ARCH" "$REGEX_LINE_CPUS_ONLINE" \ "$REGEX_LINE_CPUS_AVAIL" < $LOGS_DIR/basic_header.log @@ -156,10 +156,10 @@ PERF_EXIT_CODE=$? REGEX_LINES_HEADER="#\s*Children\s+Self\s+sys\s+usr\s+Command\s+Shared Object\s+Symbol" REGEX_LINES="\s*$RE_NUMBER%\s+$RE_NUMBER%\s+$RE_NUMBER%\s+$RE_NUMBER%\s+\S+\s+\[kernel\.(?:vmlinux)|(?:kallsyms)\]\s+\[[k\.]\]\s+\w+" -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "$REGEX_LINES_HEADER" "$REGEX_LINES" < $LOGS_DIR/basic_cpuut.log CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_errors_whitelisted.pl" \ +"$DIR_PATH/../common/check_errors_whitelisted.py" \ "$DIR_PATH/stderr-whitelist.txt" < $LOGS_DIR/basic_cpuut.err (( CHECK_EXIT_CODE += $? )) @@ -174,9 +174,9 @@ $CMD_PERF report --stdio -i $CURRENT_TEST_DIR/perf.data --pid=1 > $LOGS_DIR/basi PERF_EXIT_CODE=$? grep -P -v '^#' $LOGS_DIR/basic_pid.log | grep -P '\s+[\d\.]+%' | \ - "$DIR_PATH/../common/check_all_lines_matched.pl" "systemd|init" + "$DIR_PATH/../common/check_all_lines_matched.py" "systemd|init" CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_errors_whitelisted.pl" \ +"$DIR_PATH/../common/check_errors_whitelisted.py" \ "$DIR_PATH/stderr-whitelist.txt" < $LOGS_DIR/basic_pid.err (( CHECK_EXIT_CODE += $? )) @@ -190,10 +190,10 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "pid" $CMD_PERF report --stdio -i $CURRENT_TEST_DIR/perf.data --symbols=dummynonexistingsymbol > $LOGS_DIR/basic_symbols.log 2> $LOGS_DIR/basic_symbols.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_lines_matched.pl" \ +"$DIR_PATH/../common/check_all_lines_matched.py" \ "$RE_LINE_EMPTY" "$RE_LINE_COMMENT" < $LOGS_DIR/basic_symbols.log CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_errors_whitelisted.pl" \ +"$DIR_PATH/../common/check_errors_whitelisted.py" \ "$DIR_PATH/stderr-whitelist.txt" < $LOGS_DIR/basic_symbols.err (( CHECK_EXIT_CODE += $? )) @@ -208,9 +208,9 @@ $CMD_PERF report --stdio -i $CURRENT_TEST_DIR/perf.data --symbol-filter=map > $L PERF_EXIT_CODE=$? grep -P -v '^#' $LOGS_DIR/basic_symbolfilter.log | grep -P '\s+[\d\.]+%' | \ - "$DIR_PATH/../common/check_all_lines_matched.pl" "\[[k\.]\]\s+.*map" + "$DIR_PATH/../common/check_all_lines_matched.py" "\[[k\.]\]\s+.*map" CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_errors_whitelisted.pl" \ +"$DIR_PATH/../common/check_errors_whitelisted.py" \ "$DIR_PATH/stderr-whitelist.txt" < $LOGS_DIR/basic_symbolfilter.err (( CHECK_EXIT_CODE += $? )) @@ -224,7 +224,7 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "symbol filter" $CMD_PERF report -i $CURRENT_TEST_DIR/perf.data.1 --stdio --header-only > $LOGS_DIR/latency_header.log PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ ", context_switch = 1, " < $LOGS_DIR/latency_header.log CHECK_EXIT_CODE=$? @@ -236,10 +236,10 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "latency header" $CMD_PERF report --stdio -i $CURRENT_TEST_DIR/perf.data.1 > $LOGS_DIR/latency_default.log 2> $LOGS_DIR/latency_default.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "# Overhead Latency Command" < $LOGS_DIR/latency_default.log CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_errors_whitelisted.pl" \ +"$DIR_PATH/../common/check_errors_whitelisted.py" \ "stderr-whitelist.txt" < $LOGS_DIR/latency_default.err (( CHECK_EXIT_CODE += $? )) @@ -251,10 +251,10 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "default report for latency profi $CMD_PERF report --latency --stdio -i $CURRENT_TEST_DIR/perf.data.1 > $LOGS_DIR/latency_latency.log 2> $LOGS_DIR/latency_latency.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "# Latency Overhead Command" < $LOGS_DIR/latency_latency.log CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_errors_whitelisted.pl" \ +"$DIR_PATH/../common/check_errors_whitelisted.py" \ "stderr-whitelist.txt" < $LOGS_DIR/latency_latency.err (( CHECK_EXIT_CODE += $? )) @@ -266,11 +266,11 @@ print_results $PERF_EXIT_CODE $CHECK_EXIT_CODE "latency report for latency profi $CMD_PERF report --hierarchy --sort latency,parallelism,comm,symbol --parallelism=1,2 --stdio -i $CURRENT_TEST_DIR/perf.data.1 > $LOGS_DIR/parallelism_hierarchy.log 2> $LOGS_DIR/parallelism_hierarchy.err PERF_EXIT_CODE=$? -"$DIR_PATH/../common/check_all_patterns_found.pl" \ +"$DIR_PATH/../common/check_all_patterns_found.py" \ "# Latency Parallelism / Command / Symbol" \ < $LOGS_DIR/parallelism_hierarchy.log CHECK_EXIT_CODE=$? -"$DIR_PATH/../common/check_errors_whitelisted.pl" \ +"$DIR_PATH/../common/check_errors_whitelisted.py" \ "stderr-whitelist.txt" < $LOGS_DIR/parallelism_hierarchy.err (( CHECK_EXIT_CODE += $? )) diff --git a/tools/perf/tests/shell/common/check_all_lines_matched.pl b/tools/perf/tests/shell/common/check_all_lines_matched.pl deleted file mode 100755 index fded48959..000000000 --- a/tools/perf/tests/shell/common/check_all_lines_matched.pl +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/perl -# SPDX-License-Identifier: GPL-2.0 - -@regexps = @ARGV; - -$max_printed_lines = 20; -$max_printed_lines = $ENV{TESTLOG_ERR_MSG_MAX_LINES} if (defined $ENV{TESTLOG_ERR_MSG_MAX_LINES}); - -$quiet = 1; -$quiet = 0 if (defined $ENV{TESTLOG_VERBOSITY} && $ENV{TESTLOG_VERBOSITY} ge 2); - -$passed = 1; -$lines_printed = 0; - -while (<STDIN>) -{ - s/\n//; - - $line_matched = 0; - for $r (@regexps) - { - if (/$r/) - { - $line_matched = 1; - last; - } - } - - unless ($line_matched) - { - if ($lines_printed++ < $max_printed_lines) - { - print "Line did not match any pattern: \"$_\"\n" unless $quiet; - } - $passed = 0; - } -} - -exit ($passed == 0); diff --git a/tools/perf/tests/shell/common/check_all_lines_matched.py b/tools/perf/tests/shell/common/check_all_lines_matched.py new file mode 100755 index 000000000..2b08b9f86 --- /dev/null +++ b/tools/perf/tests/shell/common/check_all_lines_matched.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +import os +import re +import sys + + +def main(argv): + max_printed = 20 + if "TESTLOG_ERR_MSG_MAX_LINES" in os.environ: + try: + max_printed = int(os.environ["TESTLOG_ERR_MSG_MAX_LINES"]) + except ValueError: + pass + + quiet = True + try: + if int(os.environ.get("TESTLOG_VERBOSITY", "0")) >= 2: + quiet = False + except ValueError: + pass + + passed = True + lines_printed = 0 + + for line in sys.stdin: + line = line.rstrip("\n") + matched = False + for r in argv: + if re.search(r, line): + matched = True + break + if not matched: + show = lines_printed < max_printed + lines_printed += 1 + if show and not quiet: + print(f'Line did not match any pattern: "{line}"') + passed = False + + return 0 if passed else 1 + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1:])) diff --git a/tools/perf/tests/shell/common/check_all_patterns_found.pl b/tools/perf/tests/shell/common/check_all_patterns_found.pl deleted file mode 100755 index 11bdf1d34..000000000 --- a/tools/perf/tests/shell/common/check_all_patterns_found.pl +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/perl -# SPDX-License-Identifier: GPL-2.0 - -@regexps = @ARGV; - -$quiet = 1; -$quiet = 0 if (defined $ENV{TESTLOG_VERBOSITY} && $ENV{TESTLOG_VERBOSITY} ge 2); - -%found = (); -$passed = 1; - -while (<STDIN>) -{ - s/\n//; - - for $r (@regexps) - { - if (/$r/) - { - $found{$r} = 1; # FIXME: maybe add counters -- how many times was the regexp matched - } - } -} - -for $r (@regexps) -{ - unless (exists $found{$r}) - { - print "Regexp not found: \"$r\"\n" unless $quiet; - $passed = 0; - } -} - -exit ($passed == 0); diff --git a/tools/perf/tests/shell/common/check_all_patterns_found.py b/tools/perf/tests/shell/common/check_all_patterns_found.py new file mode 100755 index 000000000..f94487f25 --- /dev/null +++ b/tools/perf/tests/shell/common/check_all_patterns_found.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +import os +import re +import sys + + +def main(argv): + quiet = True + try: + if int(os.environ.get("TESTLOG_VERBOSITY", "0")) >= 2: + quiet = False + except ValueError: + pass + + found = set() + for line in sys.stdin: + line = line.rstrip("\n") + for r in argv: + if re.search(r, line): + found.add(r) + + passed = True + for r in argv: + if r not in found: + if not quiet: + print(f'Regexp not found: "{r}"') + passed = False + + return 0 if passed else 1 + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1:])) diff --git a/tools/perf/tests/shell/common/check_errors_whitelisted.pl b/tools/perf/tests/shell/common/check_errors_whitelisted.pl deleted file mode 100755 index c57d355dd..000000000 --- a/tools/perf/tests/shell/common/check_errors_whitelisted.pl +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/perl -# SPDX-License-Identifier: GPL-2.0 - -$whitelist_file = shift; - -if (defined $whitelist_file) -{ - open (INFILE, $whitelist_file) or die "Checker error: Unable to open the whitelist file: $whitelist_file\n"; - @regexps = <INFILE>; - close INFILE or die "Checker error: Unable to close the whitelist file: $whitelist_file\n"; -} -else -{ - @regexps = (); -} - -$max_printed_lines = 20; -$max_printed_lines = $ENV{TESTLOG_ERR_MSG_MAX_LINES} if (defined $ENV{TESTLOG_ERR_MSG_MAX_LINES}); - -$quiet = 1; -$quiet = 0 if (defined $ENV{TESTLOG_VERBOSITY} && $ENV{TESTLOG_VERBOSITY} ge 2); - -$passed = 1; -$lines_printed = 0; - -while (<STDIN>) -{ - s/\n//; - - $line_matched = 0; - for $r (@regexps) - { - chomp $r; - if (/$r/) - { - $line_matched = 1; - last; - } - } - - unless ($line_matched) - { - if ($lines_printed++ < $max_printed_lines) - { - print "Line did not match any pattern: \"$_\"\n" unless $quiet; - } - $passed = 0; - } -} - -exit ($passed == 0); diff --git a/tools/perf/tests/shell/common/check_errors_whitelisted.py b/tools/perf/tests/shell/common/check_errors_whitelisted.py new file mode 100755 index 000000000..86a6a729c --- /dev/null +++ b/tools/perf/tests/shell/common/check_errors_whitelisted.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +import os +import re +import sys + + +def main(argv): + if argv: + whitelist = argv[0] + try: + with open(whitelist) as f: + regexps = [ln.rstrip("\n") for ln in f] + except OSError: + sys.exit(f"Checker error: Unable to open the whitelist file: {whitelist}") + else: + regexps = [] + + max_printed = 20 + if "TESTLOG_ERR_MSG_MAX_LINES" in os.environ: + try: + max_printed = int(os.environ["TESTLOG_ERR_MSG_MAX_LINES"]) + except ValueError: + pass + + quiet = True + try: + if int(os.environ.get("TESTLOG_VERBOSITY", "0")) >= 2: + quiet = False + except ValueError: + pass + + passed = True + lines_printed = 0 + + for line in sys.stdin: + line = line.rstrip("\n") + matched = False + for r in regexps: + if re.search(r, line): + matched = True + break + if not matched: + show = lines_printed < max_printed + lines_printed += 1 + if show and not quiet: + print(f'Line did not match any pattern: "{line}"') + passed = False + + return 0 if passed else 1 + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1:])) diff --git a/tools/perf/tests/shell/common/check_no_patterns_found.pl b/tools/perf/tests/shell/common/check_no_patterns_found.pl deleted file mode 100755 index 770999e87..000000000 --- a/tools/perf/tests/shell/common/check_no_patterns_found.pl +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/perl -# SPDX-License-Identifier: GPL-2.0 - -@regexps = @ARGV; - -$quiet = 1; -$quiet = 0 if (defined $ENV{TESTLOG_VERBOSITY} && $ENV{TESTLOG_VERBOSITY} ge 2); - -%found = (); -$passed = 1; - -while (<STDIN>) -{ - s/\n//; - - for $r (@regexps) - { - if (/$r/) - { - $found{$r} = 1; - } - } -} - -for $r (@regexps) -{ - if (exists $found{$r}) - { - print "Regexp found: \"$r\"\n" unless $quiet; - $passed = 0; - } -} - -exit ($passed == 0); diff --git a/tools/perf/tests/shell/common/check_no_patterns_found.py b/tools/perf/tests/shell/common/check_no_patterns_found.py new file mode 100755 index 000000000..0df0a4961 --- /dev/null +++ b/tools/perf/tests/shell/common/check_no_patterns_found.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +import os +import re +import sys + + +def main(argv): + quiet = True + try: + if int(os.environ.get("TESTLOG_VERBOSITY", "0")) >= 2: + quiet = False + except ValueError: + pass + + found = set() + for line in sys.stdin: + line = line.rstrip("\n") + for r in argv: + if re.search(r, line): + found.add(r) + + passed = True + for r in argv: + if r in found: + if not quiet: + print(f'Regexp found: "{r}"') + passed = False + + return 0 if passed else 1 + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1:])) -- 2.43.0
