diff options
| author | Ben Craig <ben.craig@ni.com> | 2017-05-09 01:34:12 +0000 |
|---|---|---|
| committer | Ben Craig <ben.craig@ni.com> | 2017-05-09 01:34:12 +0000 |
| commit | c6aa3e7963d0848c8d18625a68b06be729017049 (patch) | |
| tree | a8895dadacd869bacfb23aeffa5556355cfb29aa /utils | |
| parent | 2a1cb9c2e667c9dff8da7aa0383d3b50da304de5 (diff) | |
Fix Windows tests when __config_site is present.
Previously, the force includes would complain about a missing _DEBUG symbol.
Now we dump macros before adding the force includes to the command line.
Now with proper newlines.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@302497 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/libcxx/test/config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/libcxx/test/config.py b/utils/libcxx/test/config.py index 7f1ae851b..47784348d 100644 --- a/utils/libcxx/test/config.py +++ b/utils/libcxx/test/config.py @@ -546,6 +546,7 @@ class Configuration(object): def configure_compile_flags_header_includes(self): support_path = os.path.join(self.libcxx_src_root, 'test', 'support') + self.configure_config_site_header() if self.cxx_stdlib_under_test != 'libstdc++' and \ not self.is_windows: self.cxx.compile_flags += [ @@ -561,7 +562,6 @@ class Configuration(object): '-include', os.path.join(support_path, 'set_windows_crt_report_mode.h') ] - self.configure_config_site_header() cxx_headers = self.get_lit_conf('cxx_headers') if cxx_headers == '' or (cxx_headers is None and self.cxx_stdlib_under_test != 'libc++'): |