Author: Jan Svoboda Date: 2021-06-14T12:55:56+02:00 New Revision: 1d8882b5e44e577f226b7a5a83c27df3b16b3ab6
URL: https://github.com/llvm/llvm-project/commit/1d8882b5e44e577f226b7a5a83c27df3b16b3ab6 DIFF: https://github.com/llvm/llvm-project/commit/1d8882b5e44e577f226b7a5a83c27df3b16b3ab6.diff LOG: [clang][deps] Fix failing modules.cpp test Commit d8bab69ead22a10dc4cdb2e36f6ea6fdfe774e2e updated the ClangScanDeps/modules.cpp test. The new `{{.*}}` regex is supposed to only match `modules_cdb_input.o`, `a.o` or `b.o`. However, due to non-determinism, this can sometimes also match `modules_cdb_input2.o`, causing match failure on the next line. This commit changes the regex to only match one of the three valid cases. Buildbot failure: https://lab.llvm.org/buildbot/#/builders/109/builds/16675 Added: Modified: clang/test/ClangScanDeps/modules.cpp Removed: ################################################################################ diff --git a/clang/test/ClangScanDeps/modules.cpp b/clang/test/ClangScanDeps/modules.cpp index b7daf51b4a80..af7cdcb9d68c 100644 --- a/clang/test/ClangScanDeps/modules.cpp +++ b/clang/test/ClangScanDeps/modules.cpp @@ -48,7 +48,7 @@ // CHECK1-NEXT: Inputs{{/|\\}}header2.h // CHECK1: Inputs{{/|\\}}header.h -// CHECK2: {{.*}}.o: +// CHECK2: {{(modules_cdb_input)|(a)|(b)}}.o: // CHECK2-NEXT: modules_cdb_input.cpp // CHECK2-NEXT: Inputs{{/|\\}}module.modulemap // CHECK2-NEXT: Inputs{{/|\\}}header.h _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
