[Openmp-commits] [PATCH] D79529: [OpenMP][NFC] Fix `not` sustitution in tests

[Joel E. Denny via Phabricator via Openmp-commits]

jdenny created this revision.
jdenny added reviewers: Hahnfeld, jdoerfert.
Herald added subscribers: guansong, yaxunl.
Herald added a project: OpenMP.

D78566 <https://reviews.llvm.org/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 <https://reviews.llvm.org/D78566> review) as
a safer option.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D79529

Files:
  openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg
  openmp/libomptarget/test/lit.cfg
  openmp/runtime/test/lit.cfg
  openmp/tools/archer/tests/lit.cfg


Index: openmp/tools/archer/tests/lit.cfg
===================================================================
--- openmp/tools/archer/tests/lit.cfg
+++ openmp/tools/archer/tests/lit.cfg
@@ -111,7 +111,7 @@
 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.
Index: openmp/runtime/test/lit.cfg
===================================================================
--- openmp/runtime/test/lit.cfg
+++ openmp/runtime/test/lit.cfg
@@ -127,7 +127,7 @@
 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))
Index: openmp/libomptarget/test/lit.cfg
===================================================================
--- openmp/libomptarget/test/lit.cfg
+++ openmp/libomptarget/test/lit.cfg
@@ -103,7 +103,7 @@
             "%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, \
@@ -146,4 +146,4 @@
 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))
Index: openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg
===================================================================
--- openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg
+++ openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg
@@ -67,4 +67,4 @@
 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))


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D79529.262503.patch
Type: text/x-patch
Size: 2801 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20200507/92e99de4/attachment.bin>