Skip to content

Commit

Permalink
[OpenMP][NFC] Fix not sustitution in tests
Browse files Browse the repository at this point in the history
D78566 introduced a `\bnot\b` lit substitution in OpenMP test suites.
However, that would corrupt a command like
`FileCheck -implicit-check-not` or any file name like `%t.not`.  We
could use lookbehind/lookahead assertions to avoid such cases, but
this patch switches to `%not` (suggested during the D78566 review) as
a safer option.

Reviewed By: jdoerfert

Differential Revision: https://reviews.llvm.org/D79529
  • Loading branch information
jdenny-ornl committed May 11, 2020
1 parent 99aa87a commit dd5ba4b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg
Expand Up @@ -67,4 +67,4 @@ config.substitutions.append(("%openmp_flags", config.test_openmp_flags))
config.substitutions.append(("%flags", config.test_flags))

config.substitutions.append(("%run", "%t"))
config.substitutions.append((r"\bnot\b", config.libomptarget_not))
config.substitutions.append(("%not", config.libomptarget_not))
4 changes: 2 additions & 2 deletions openmp/libomptarget/test/lit.cfg
Expand Up @@ -103,7 +103,7 @@ for libomptarget_target in config.libomptarget_all_targets:
"%t-" + libomptarget_target))
config.substitutions.append(("%libomptarget-run-fail-" + \
libomptarget_target, \
"not %t-" + libomptarget_target))
"%not %t-" + libomptarget_target))
config.substitutions.append(("%clangxx-" + libomptarget_target, \
"%clangxx %openmp_flags %flags -fopenmp-targets=" + libomptarget_target))
config.substitutions.append(("%clang-" + libomptarget_target, \
Expand Down Expand Up @@ -146,4 +146,4 @@ config.substitutions.append(("%clangxx", config.test_cxx_compiler))
config.substitutions.append(("%clang", config.test_c_compiler))
config.substitutions.append(("%openmp_flags", config.test_openmp_flags))
config.substitutions.append(("%flags", config.test_flags))
config.substitutions.append((r"\bnot\b", config.libomptarget_not))
config.substitutions.append(("%not", config.libomptarget_not))
2 changes: 1 addition & 1 deletion openmp/runtime/test/lit.cfg
Expand Up @@ -127,7 +127,7 @@ config.substitutions.append(("%clang", config.test_c_compiler))
config.substitutions.append(("%openmp_flags", config.test_openmp_flags))
config.substitutions.append(("%flags", config.test_flags))
config.substitutions.append(("%python", '"%s"' % (sys.executable)))
config.substitutions.append((r"\bnot\b", config.test_not))
config.substitutions.append(("%not", config.test_not))

if config.has_ompt:
config.substitutions.append(("FileCheck", "tee %%t.out | %s" % config.test_filecheck))
Expand Down
2 changes: 1 addition & 1 deletion openmp/tools/archer/tests/lit.cfg
Expand Up @@ -111,7 +111,7 @@ config.substitutions.append(("%suppression", "env TSAN_OPTIONS='ignore_noninstru
config.substitutions.append(("%deflake", os.path.join(os.path.dirname(__file__), "deflake.bash")))

config.substitutions.append(("FileCheck", config.test_filecheck))
config.substitutions.append((r"\bnot\b", config.test_not))
config.substitutions.append(("%not", config.test_not))
config.substitutions.append(("%sort-threads", "sort --numeric-sort --stable"))
if config.operating_system == 'Windows':
# No such environment variable on Windows.
Expand Down

0 comments on commit dd5ba4b

Please sign in to comment.