diff options
| -rw-r--r-- | libcxx/test/libcxx/compiler.py | 12 | ||||
| -rw-r--r-- | libcxx/test/libcxx/test/format.py | 5 |
2 files changed, 3 insertions, 14 deletions
diff --git a/libcxx/test/libcxx/compiler.py b/libcxx/test/libcxx/compiler.py index 81fb07c02f8..885d0ce484a 100644 --- a/libcxx/test/libcxx/compiler.py +++ b/libcxx/test/libcxx/compiler.py @@ -49,18 +49,6 @@ class CXXCompiler(object): if self.type is None or self.version is None: self._initTypeAndVersion() - def copy(self): - new_cxx = CXXCompiler( - self.path, flags=self.flags, compile_flags=self.compile_flags, - link_flags=self.link_flags, warning_flags=self.warning_flags, - verify_supported=self.verify_supported, - verify_flags=self.verify_flags, use_verify=self.use_verify, - modules_flags=self.modules_flags, use_modules=self.use_modules, - use_ccache=self.use_ccache, use_warnings=self.use_warnings, - compile_env=self.compile_env, cxx_type=self.type, - cxx_version=self.version) - return new_cxx - def isVerifySupported(self): if self.verify_supported is None: self.verify_supported = self.hasCompileFlag(['-Xclang', diff --git a/libcxx/test/libcxx/test/format.py b/libcxx/test/libcxx/test/format.py index e87a8a5bd7d..227d9272473 100644 --- a/libcxx/test/libcxx/test/format.py +++ b/libcxx/test/libcxx/test/format.py @@ -7,6 +7,7 @@ # #===----------------------------------------------------------------------===## +import copy import errno import os import time @@ -36,7 +37,7 @@ class LibcxxTestFormat(object): def __init__(self, cxx, use_verify_for_fail, execute_external, executor, exec_env): - self.cxx = cxx.copy() + self.cxx = copy.deepcopy(cxx) self.use_verify_for_fail = use_verify_for_fail self.execute_external = execute_external self.executor = executor @@ -115,7 +116,7 @@ class LibcxxTestFormat(object): tmpBase) script = lit.TestRunner.applySubstitutions(script, substitutions) - test_cxx = self.cxx.copy() + test_cxx = copy.deepcopy(self.cxx) if is_fail_test: test_cxx.useCCache(False) test_cxx.useWarnings(False) |
