2014-03-12 11:53 GMT+09:00 Saleem Abdulrasool <[email protected]>: > Author: compnerd > Date: Tue Mar 11 21:53:12 2014 > New Revision: 203633 > > URL: http://llvm.org/viewvc/llvm-project?rev=203633&view=rev > Log: > Lexer: split test into separate files > > Unfortunately, XFAIL applies to the entire file. Split the test into two > different units, enabling the proper application of XFAIL on the test which is > expected to fail on Windows. > > Added: > cfe/trunk/test/Lexer/cross-windows-on-linux-default.cpp > Modified: > cfe/trunk/test/Lexer/cross-windows-on-linux.cpp > > Added: cfe/trunk/test/Lexer/cross-windows-on-linux-default.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/cross-windows-on-linux-default.cpp?rev=203633&view=auto > ============================================================================== > --- cfe/trunk/test/Lexer/cross-windows-on-linux-default.cpp (added) > +++ cfe/trunk/test/Lexer/cross-windows-on-linux-default.cpp Tue Mar 11 > 21:53:12 2014 > @@ -0,0 +1,6 @@ > +// RUN: not %clang_cc1 -fsyntax-only -fms-compatibility -triple i686-win32 > %s 2>&1 \ > +// RUN: | FileCheck %s > + > +#include "Inputs\success.h" > + > +// CHECK: error: success > > Modified: cfe/trunk/test/Lexer/cross-windows-on-linux.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/cross-windows-on-linux.cpp?rev=203633&r1=203632&r2=203633&view=diff > ============================================================================== > --- cfe/trunk/test/Lexer/cross-windows-on-linux.cpp (original) > +++ cfe/trunk/test/Lexer/cross-windows-on-linux.cpp Tue Mar 11 21:53:12 2014 > @@ -1,14 +1,12 @@ > -// RUN: not %clang_cc1 -fsyntax-only -triple i686-win32 %s 2>&1 \ > -// RUN: | FileCheck %s -check-prefix CHECK-NO-COMPAT > -// XFAIL: win32 > - > -// RUN: not %clang_cc1 -fsyntax-only -fms-compatibility -triple i686-win32 > %s 2>&1 \ > -// RUN: | FileCheck %s -check-prefix CHECK-COMPAT > +// RUN: not %clang_cc1 -fsyntax-only -triple i686-win32 %s 2>&1 | FileCheck > %s > > #include "Inputs\success.h" > > -// CHECK-NO-COMPAT: error: 'Inputs\success.h' file not found > -// CHECK-NO-COMPAT: #include "Inputs\success.h" > -// CHECK-NO-COMPAT: ^ > +// CHECK: error: 'Inputs\success.h' file not found > +// CHECK: #include "Inputs\success.h" > +// CHECK: ^ > + > +// expected to fail on windows as the inclusion would success and the > +// compilation will fail due to the '#error success' > +// XFAIL: win32 > > -// CHECK-COMPAT: error: success
As far as I checked, this test depends on whether host filesystem API is win32 or not. Even on cygwin, "/cygdrive/x/path/to/Inputs\success.h" is accepted (with a warning). IMO, we could check just only possibly successful path (cross-windows-on-linux-default.cpp) and deprecate this, cross-windows-on-linux.cpp. _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
