Author: ericwf
Date: Tue Oct 11 19:28:14 2016
New Revision: 283960
URL: http://llvm.org/viewvc/llvm-project?rev=283960&view=rev
Log:
Add mork workarounds for running the test suite against libstdc++
Modified:
libcxx/trunk/test/libcxx/test/config.py
libcxx/trunk/test/lit.cfg
libcxx/trunk/test/lit.site.cfg.in
Modified: libcxx/trunk/test/libcxx/test/config.py
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/config.py?rev=283960&r1=283959&r2=283960&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/test/config.py (original)
+++ libcxx/trunk/test/libcxx/test/config.py Tue Oct 11 19:28:14 2016
@@ -225,6 +225,14 @@ class Configuration(object):
self.lit_config.fatal(
'unsupported value for "cxx_stdlib_under_test": %s'
% self.cxx_stdlib_under_test)
+ if self.cxx_stdlib_under_test == 'libstdc++':
+ # Manually enable the experimental and filesystem tests for
libstdc++
+ # if the options aren't present.
+ # FIXME this is a hack.
+ if self.get_lit_conf('enable_experimental') is None:
+ self.config.enable_experimental = 'true'
+ if self.get_lit_conf('enable_filesystem') is None:
+ self.config.enable_filesystem = 'true'
def configure_use_clang_verify(self):
'''If set, run clang with -verify on failing tests.'''
@@ -467,7 +475,7 @@ class Configuration(object):
assert os.path.isdir(static_env)
self.cxx.compile_flags += ['-DLIBCXX_FILESYSTEM_STATIC_TEST_ROOT="%s"'
% static_env]
- dynamic_env = os.path.join(self.libcxx_obj_root, 'test',
+ dynamic_env = os.path.join(self.config.test_exec_root,
'filesystem', 'Output', 'dynamic_env')
dynamic_env = os.path.realpath(dynamic_env)
if not os.path.isdir(dynamic_env):
Modified: libcxx/trunk/test/lit.cfg
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.cfg?rev=283960&r1=283959&r2=283960&view=diff
==============================================================================
--- libcxx/trunk/test/lit.cfg (original)
+++ libcxx/trunk/test/lit.cfg Tue Oct 11 19:28:14 2016
@@ -37,7 +37,6 @@ if obj_root is None:
obj_root = tempfile.mkdtemp(prefix='libcxx-testsuite-')
lit_config.warning('Creating temporary directory for object root: %s' %
obj_root)
- config.libcxx_obj_root = obj_root
config.test_exec_root = os.path.join(obj_root, 'test')
Modified: libcxx/trunk/test/lit.site.cfg.in
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.site.cfg.in?rev=283960&r1=283959&r2=283960&view=diff
==============================================================================
--- libcxx/trunk/test/lit.site.cfg.in (original)
+++ libcxx/trunk/test/lit.site.cfg.in Tue Oct 11 19:28:14 2016
@@ -29,4 +29,5 @@ config.libcxxabi_shared = "@LIBC
config.libcxx_external_thread_api = "@LIBCXX_HAS_EXTERNAL_THREAD_API@"
# Let the main config do the real work.
+config.loaded_site_config = True
lit_config.load_config(config, "@LIBCXX_SOURCE_DIR@/test/lit.cfg")
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
