[clang] 7a34dca - Fix failing tests after VCTOOLSDIR change

Hans Wennborg via cfe-commits cfe-commits at lists.llvm.org
Wed Aug 26 07:34:42 PDT 2020


Author: Zachary Henkel
Date: 2020-08-26T16:30:50+02:00
New Revision: 7a34dca0f3918ab1c0397e56dd64a3c04164c8b6

URL: https://github.com/llvm/llvm-project/commit/7a34dca0f3918ab1c0397e56dd64a3c04164c8b6
DIFF: https://github.com/llvm/llvm-project/commit/7a34dca0f3918ab1c0397e56dd64a3c04164c8b6.diff

LOG: Fix failing tests after VCTOOLSDIR change

Switch from hardcoded x64 arch to a regex in the target triple

Differential revision: https://reviews.llvm.org/D86622

Added: 
    

Modified: 
    clang/test/Driver/cl-options.c

Removed: 
    


################################################################################
diff  --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
index 973e74ebe2eb..f4d2d66129b0 100644
--- a/clang/test/Driver/cl-options.c
+++ b/clang/test/Driver/cl-options.c
@@ -684,7 +684,7 @@
 
 // Validate that the default triple is used when run an empty tools dir is specified
 // RUN: %clang_cl -vctoolsdir "" -### -- %s 2>&1 | FileCheck %s --check-prefix VCTOOLSDIR
-// VCTOOLSDIR: "-cc1" "-triple" "x86_64-pc-windows-msvc19.11.0"
+// VCTOOLSDIR: "-triple" "{{[a-zA-Z0-9_-]*}}-pc-windows-msvc19.11.0"
 
 // Validate that built-in include paths are based on the supplied path
 // RUN: %clang_cl -vctoolsdir "/fake" -### -- %s 2>&1 | FileCheck %s --check-prefix FAKEDIR


        


More information about the cfe-commits mailing list