Author: chapuni
Date: Tue Jun 23 03:37:21 2015
New Revision: 240387
URL: http://llvm.org/viewvc/llvm-project?rev=240387&view=rev
Log:
Tweak clang/test/Modules/modules-with-same-name.m to run with GnuWin32's
find.exe on newer version of Windows.
It seems "*.pcm" would be expanded with current directory by NTOS 6.x's msvcrt.
GnuWin32 utils are affected.
To avoid the issue, put an expression that msvcrt's glob won't match, like
"*.pc[m]".
Modified:
cfe/trunk/test/Modules/modules-with-same-name.m
Modified: cfe/trunk/test/Modules/modules-with-same-name.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/modules-with-same-name.m?rev=240387&r1=240386&r2=240387&view=diff
==============================================================================
--- cfe/trunk/test/Modules/modules-with-same-name.m (original)
+++ cfe/trunk/test/Modules/modules-with-same-name.m Tue Jun 23 03:37:21 2015
@@ -7,19 +7,19 @@
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t
-fmodules-ignore-macro=EXPECTED_PATH -fmodules-ignore-macro=DIRECT
-fsyntax-only %s -verify -I %S/Inputs/modules-with-same-name/path2/A -DDIRECT
-DEXPECTED_PATH=2
// Confirm that we have two pcm files (one for each 'A').
-// RUN: find %t -name "A-*.pcm" | count 2
+// RUN: find %t -name "A-*.pc[m]" | count 2
// DependsOnA, using A from path 1
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t
-fmodules-ignore-macro=EXPECTED_PATH -fmodules-ignore-macro=DIRECT
-fsyntax-only %s -verify -I %S/Inputs/modules-with-same-name/DependsOnA -I
%S/Inputs/modules-with-same-name/path1/A -DEXPECTED_PATH=1
// Confirm that we have three pcm files (one for each 'A', and one for
'DependsOnA')
-// RUN: find %t -name "*.pcm" | count 3
+// RUN: find %t -name "*.pc[m]" | count 3
// DependsOnA, using A from path 2
// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t
-fmodules-ignore-macro=EXPECTED_PATH -fmodules-ignore-macro=DIRECT
-fsyntax-only %s -verify -I %S/Inputs/modules-with-same-name/DependsOnA -I
%S/Inputs/modules-with-same-name/path2/A -DEXPECTED_PATH=2
// Confirm that we still have three pcm files, since DependsOnA will be rebuilt
-// RUN: find %t -name "*.pcm" | count 3
+// RUN: find %t -name "*.pc[m]" | count 3
#ifdef DIRECT
@import A;
_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
