From 1d8882b5e44e577f226b7a5a83c27df3b16b3ab6 Mon Sep 17 00:00:00 2001 From: Jan Svoboda Date: Mon, 14 Jun 2021 12:55:32 +0200 Subject: [PATCH] [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 --- clang/test/ClangScanDeps/modules.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/test/ClangScanDeps/modules.cpp b/clang/test/ClangScanDeps/modules.cpp index b7daf51..af7cdcb 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 -- 2.7.4