This seems to have broken the build on Windows: http://bb.pgr.jp/builders/cmake-clang-i686-mingw32/builds/6133
Note: I am not seeing this broken in MSVC 12 on Windows, so it may be mingw specific. ~Aaron On Thu, Dec 5, 2013 at 1:17 AM, Lang Hames <[email protected]> wrote: > Author: lhames > Date: Thu Dec 5 00:17:42 2013 > New Revision: 196474 > > URL: http://llvm.org/viewvc/llvm-project?rev=196474&view=rev > Log: > Re-apply r196439, with sed patterns modified to be more DOS-path friendly. > > Modified: > clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main.cpp > > Modified: > clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main.cpp > URL: > http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main.cpp?rev=196474&r1=196473&r2=196474&view=diff > ============================================================================== > --- clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main.cpp > (original) > +++ clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main.cpp > Thu Dec 5 00:17:42 2013 > @@ -12,11 +12,13 @@ > // RUN: ls -1 %T/SerializeTest | FileCheck %s --check-prefix=MAIN_CPP > // RUN: ls -1 %T/SerializeTest | FileCheck %s --check-prefix=COMMON_CPP > // We need to put the build path to the expected YAML file to diff against > the generated one. > -// RUN: sed -e 's#$(path)#%/T/SerializeTest#g' -e > "s#\([A-Z]:/.*\.[chp]*\)#'\1'#g" %S/main_expected.yaml > > %T/SerializeTest/main_expected.yaml > +// RUN: sed -e 's#$(path)#%/T/SerializeTest#g' -e > "s#^\(.*:\)[[:space:]]*\(.*\)#\1 \2#g" %S/main_expected.yaml > > %T/SerializeTest/main_expected.yaml > // RUN: sed -i -e 's#\\#/#g' %T/SerializeTest/main.cpp_*.yaml > +// RUN: sed -i -e "s#^\([^:]*:\)[[:space:]]*'*\(/[^']*\)'*\$#\1 \2#g" > %T/SerializeTest/main.cpp_*.yaml > // RUN: diff -b %T/SerializeTest/main_expected.yaml > %T/SerializeTest/main.cpp_*.yaml > -// RUN: sed -e 's#$(path)#%/T/SerializeTest#g' -e > "s#\([A-Z]:/.*\.[chp]*\)#'\1'#g" %S/common_expected.yaml > > %T/SerializeTest/common_expected.yaml > +// RUN: sed -e 's#$(path)#%/T/SerializeTest#g' -e > "s#^\(.*:\)[[:space:]]*\(.*\)#\1 \2#g" %S/common_expected.yaml > > %T/SerializeTest/common_expected.yaml > // RUN: sed -i -e 's#\\#/#g' %T/SerializeTest/common.cpp_*.yaml > +// RUN: sed -i -e "s#^\([^:]*:\)[[:space:]]*'*\(/[^']*\)'*\$#\1 \2#g" > %T/SerializeTest/common.cpp_*.yaml > // RUN: diff -b %T/SerializeTest/common_expected.yaml > %T/SerializeTest/common.cpp_*.yaml > // > // The following are for FileCheck when used on output of 'ls'. See above. > > > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
