From 2410267c8eb18a0938dfe4aedfe2479626d7dda7 Mon Sep 17 00:00:00 2001 From: Siu Kwan Lam Date: Thu, 13 Mar 2014 13:20:08 -0500 Subject: [PATCH] Disable isolated test in conda build --- buildscripts/condarecipe/run_test.py | 2 +- llvm/__init__.py | 4 ++-- llvm/tests/__init__.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildscripts/condarecipe/run_test.py b/buildscripts/condarecipe/run_test.py index 653515f..e7a0a23 100644 --- a/buildscripts/condarecipe/run_test.py +++ b/buildscripts/condarecipe/run_test.py @@ -15,7 +15,7 @@ if sys.platform == 'darwin': s = {'64bit': 'x86_64', '32bit': 'x86'}[platform.architecture()[0]] assert target.triple.startswith(s + '-apple-darwin') -assert llvm.test(verbosity=2) == 0 +assert llvm.test(verbosity=2, run_isolated=False) == 0 check_intrinsics.main() print('llvm.__version__: %s' % llvm.__version__) diff --git a/llvm/__init__.py b/llvm/__init__.py index 11cf7bc..9b24112 100644 --- a/llvm/__init__.py +++ b/llvm/__init__.py @@ -34,14 +34,14 @@ def _extract_ptrs(objs): class LLVMException(Exception): pass -def test(verbosity=3): +def test(verbosity=3, run_isolated=True): """test(verbosity=1) -> TextTestResult Run self-test, and return the number of failures + errors """ from llvm.tests import run - result = run(verbosity=verbosity) + result = run(verbosity=verbosity, run_isolated=run_isolated) errct = len(result.failures) + len(result.errors) return errct diff --git a/llvm/tests/__init__.py b/llvm/tests/__init__.py index 67102c7..0bc4223 100644 --- a/llvm/tests/__init__.py +++ b/llvm/tests/__init__.py @@ -12,7 +12,7 @@ tests = [] # stores unittest.TestCase objects isolated_tests = [] # stores modue name -def run(verbosity=1): +def run(verbosity=1, run_isolated=True): print('llvmpy is installed in: ' + os.path.dirname(__file__)) print('llvmpy version: ' + llvm.__version__) print(sys.version) @@ -48,7 +48,7 @@ def run(verbosity=1): testresult = runner.run(suite) print(hp.heap()) - if testresult: + if testresult and run_isolated: # Run isolated tests print("run isolated tests".center(80, '-'))