Author: ericwf Date: Tue Jan 17 21:57:38 2017 New Revision: 292337 URL: http://llvm.org/viewvc/llvm-project?rev=292337&view=rev Log: More configuration changes for running the test suite against MSVC's STL
Added: libcxx/trunk/test/std/experimental/string.view/lit.local.cfg Modified: libcxx/trunk/test/libcxx/test/config.py libcxx/trunk/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp libcxx/trunk/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp Modified: libcxx/trunk/test/libcxx/test/config.py URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/config.py?rev=292337&r1=292336&r2=292337&view=diff ============================================================================== --- libcxx/trunk/test/libcxx/test/config.py (original) +++ libcxx/trunk/test/libcxx/test/config.py Tue Jan 17 21:57:38 2017 @@ -456,7 +456,14 @@ class Configuration(object): not self.is_windows: self.cxx.compile_flags += [ '-include', os.path.join(support_path, 'nasty_macros.hpp')] - if self.is_windows and self.debug_build: + if self.cxx_stdlib_under_test == 'msvc': + # FIXME: Uncomment this once STL commits the support header. + # self.cxx.compile_flags += [ + # '-include', os.path.join(support_path, + # 'msvc_stdlib_force_include.h')] + pass + if self.is_windows and self.debug_build and \ + self.cxx_stdlib_under_test != 'msvc': self.cxx.compile_flags += [ '-include', os.path.join(support_path, 'set_windows_crt_report_mode.h') Added: libcxx/trunk/test/std/experimental/string.view/lit.local.cfg URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/string.view/lit.local.cfg?rev=292337&view=auto ============================================================================== --- libcxx/trunk/test/std/experimental/string.view/lit.local.cfg (added) +++ libcxx/trunk/test/std/experimental/string.view/lit.local.cfg Tue Jan 17 21:57:38 2017 @@ -0,0 +1,3 @@ +# Disable all of the filesystem tests if the correct feature is not available. +if 'msvc' in config.available_features: + config.unsupported = True Modified: libcxx/trunk/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp?rev=292337&r1=292336&r2=292337&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp Tue Jan 17 21:57:38 2017 @@ -13,6 +13,9 @@ // long& iword(int idx); +// This test compiles but never completes when compiled against the MSVC STL +// UNSUPPORTED: msvc + #include <ios> #include <string> #include <cassert> Modified: libcxx/trunk/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp?rev=292337&r1=292336&r2=292337&view=diff ============================================================================== --- libcxx/trunk/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp (original) +++ libcxx/trunk/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp Tue Jan 17 21:57:38 2017 @@ -13,6 +13,9 @@ // void*& pword(int idx); +// This test compiles but never completes when compiled against the MSVC STL +// UNSUPPORTED: msvc + #include <ios> #include <string> #include <cassert> _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits