Skip to content

Commit 5a3c164

Browse files
committed
[test] Minor FileCheck pattern fixes
Simplify the FileCheck pattern used in test/openmp_examples/lit/runmake; most of the original pattern was never generated and hence misleading. Prevent check_compilation.py from appending an extraneous space when printing a properly newline-terminated string.
1 parent 4f1521a commit 5a3c164

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

test/openmp_examples/lit/runmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ export PATH=$PATH:$(pwd)
2323
make -f $MAKE_FILE HOMEQA=$MAKE_FILE_DIR TEST=$test_name OPT="$FLAGS" build 2>&1
2424
make -f $MAKE_FILE HOMEQA=$MAKE_FILE_DIR TEST=$test_name OPT="$FLAGS" run 2>&1
2525
make -f $MAKE_FILE HOMEQA=$MAKE_FILE_DIR TEST=$test_name OPT="$FLAGS" verify 2>&1
26-
# CHECK: {{([1-9][0-9]* tests PASSED\. 0 tests failed|[[:space:]]*PASS(ED)?[[:space:]]*$)}}
26+
# CHECK: {{^PASS$}}

test/tools/check_compilation.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ def getLogErrors(log):
103103
terminated = True
104104
else:
105105
sys.stdout.write (line)
106-
sys.stdout.write (" ")
106+
if not line.endswith("\n"):
107+
sys.stdout.write (" ")
107108
return terminated, errorList
108109

109110
def getFileSet(source, logErrors):

0 commit comments

Comments
 (0)