Author: Duncan P. N. Exon Smith Date: 2021-08-16T16:23:04-07:00 New Revision: d8a08fae0af9aa09c108b3e7c60f192249dd2098
URL: https://github.com/llvm/llvm-project/commit/d8a08fae0af9aa09c108b3e7c60f192249dd2098 DIFF: https://github.com/llvm/llvm-project/commit/d8a08fae0af9aa09c108b3e7c60f192249dd2098.diff LOG: Clean up test for -f{,no-}implicit-modules-uses-lock @arichardson pointed out in post-commit review for https://reviews.llvm.org/D95583 (b714f73defc8e075) that `-verify` has an optional argument that works a lot like `FileCheck`'s `-check-prefix`. Use it to simplify the test for `-fno-implicit-modules-use-lock`! Added: Modified: clang/test/Modules/implicit-modules-use-lock.m Removed: ################################################################################ diff --git a/clang/test/Modules/implicit-modules-use-lock.m b/clang/test/Modules/implicit-modules-use-lock.m index 811b83a7e4c76..6c9582df4de52 100644 --- a/clang/test/Modules/implicit-modules-use-lock.m +++ b/clang/test/Modules/implicit-modules-use-lock.m @@ -4,20 +4,20 @@ // // RUN: rm -rf %t.cache // RUN: %clang_cc1 -fmodules -fimplicit-module-maps \ -// RUN: -fimplicit-modules-use-lock -Rmodule-lock \ +// RUN: -fimplicit-modules-use-lock -Rmodule-lock -Rmodule-build \ // RUN: -fmodules-cache-path=%t.cache -I%S/Inputs/system-out-of-date \ // RUN: -fsyntax-only %s -Wnon-modular-include-in-framework-module \ -// RUN: -Werror=non-modular-include-in-framework-module 2>&1 \ -// RUN: | FileCheck %s -check-prefix=CHECK-LOCKS +// RUN: -Werror=non-modular-include-in-framework-module \ +// RUN: -verify=locks,build // // RUN: rm -rf %t.cache // RUN: %clang_cc1 -fmodules -fimplicit-module-maps \ -// RUN: -fno-implicit-modules-use-lock -Rmodule-lock \ +// RUN: -fno-implicit-modules-use-lock -Rmodule-lock -Rmodule-build \ // RUN: -fmodules-cache-path=%t.cache -I%S/Inputs/system-out-of-date \ // RUN: -fsyntax-only %s -Wnon-modular-include-in-framework-module \ -// RUN: -Werror=non-modular-include-in-framework-module 2>&1 \ -// RUN: | FileCheck %s -check-prefix=CHECK-NO-LOCKS -allow-empty +// RUN: -Werror=non-modular-include-in-framework-module \ +// RUN: -verify=build -// CHECK-NO-LOCKS-NOT: remark: -// CHECK-LOCKS: remark: locking '{{.*}}.pcm' to build module 'X' [-Rmodule-lock] -@import X; +@import X; // locks-remark-re {{locking '{{.*}}.pcm' to build module 'X'}} \ + // build-remark {{building module 'X'}} \ + // build-remark {{finished building module 'X'}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
