diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-18 03:57:38 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-18 03:57:38 +0000 |
| commit | 4f5f8967eb3c391eaba7e88bc4135adb679ef02b (patch) | |
| tree | fb85049e8125b45be43ff42f8ab545c1f1fc8a34 /libcxx/test | |
| parent | 40eaa9968dd747a232055b6a9fb60f674ad64f8f (diff) | |
| download | bcm5719-llvm-4f5f8967eb3c391eaba7e88bc4135adb679ef02b.tar.gz bcm5719-llvm-4f5f8967eb3c391eaba7e88bc4135adb679ef02b.zip | |
More configuration changes for running the test suite against MSVC's STL
llvm-svn: 292337
Diffstat (limited to 'libcxx/test')
4 files changed, 17 insertions, 1 deletions
diff --git a/libcxx/test/libcxx/test/config.py b/libcxx/test/libcxx/test/config.py index 8ee2d3043a2..7299dbead28 100644 --- a/libcxx/test/libcxx/test/config.py +++ b/libcxx/test/libcxx/test/config.py @@ -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') diff --git a/libcxx/test/std/experimental/string.view/lit.local.cfg b/libcxx/test/std/experimental/string.view/lit.local.cfg new file mode 100644 index 00000000000..376dbe7c16e --- /dev/null +++ b/libcxx/test/std/experimental/string.view/lit.local.cfg @@ -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 diff --git a/libcxx/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp b/libcxx/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp index 1e2ee50632a..59f0bd47876 100644 --- a/libcxx/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp +++ b/libcxx/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp @@ -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> diff --git a/libcxx/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp b/libcxx/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp index 5246ad8f644..45115823b4c 100644 --- a/libcxx/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp +++ b/libcxx/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp @@ -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> |
