Skip to content

Commit 3287ecb

Browse files
committed
rq_nfit_results.sh: fix compatibility with meson 1.8
This is a pure copy of commit 40878b6 and the small bit required from 40878b6~1 Massive de-duplication is required but that's for another day. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent ea63bed commit 3287ecb

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

scripts/rq_nfit_results.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ logfile="$1"
66

77
# lines we expect to find in the serial log
88
# if any of these are not found, this is an error
9+
# Since meson commit 1.8.0rc1~199-g23a9a25779db5, meson
10+
# never prints "Skipped: 0", "Timeout: 0", etc.
911
find_lines_re=(
1012
"auto-running .*rq_nfit_tests.sh"
1113
"[0-9]+/[0-9]+ ndctl:.*OK.*"
1214
"Ok:[ \t]+[0-9]+"
1315
"Fail:[ \t]+0"
14-
"Skipped:[ \t]+0"
15-
"Timeout:[ \t]+0"
1616
"Done .*rq_nfit_tests.sh"
1717
)
1818

@@ -36,6 +36,10 @@ error_lines_re=(
3636
"make:.*[Makefile:.*check] Error"
3737
"ninja: build stopped: subcommand failed"
3838
"[0-9]+/[0-9]+ ndctl:.*FAIL.*"
39+
'Fail:[[:blank:]]+[^0[:blank:]]'
40+
'Unexpected Pass:[[:blank:]]+[^0[:blank:]]'
41+
'Skipped:[[:blank:]]+[^0[:blank:]]'
42+
'Timeout:[[:blank:]]+[^0[:blank:]]'
3943
)
4044

4145
warn_count=0

0 commit comments

Comments
 (0)