Author: mattip <[email protected]>
Branch:
Changeset: r72019:6046a1811363
Date: 2014-06-11 19:06 +0300
http://bitbucket.org/pypy/pypy/changeset/6046a1811363/
Log: fix test, raise instead of assert
diff --git a/rpython/config/test/test_translationoption.py
b/rpython/config/test/test_translationoption.py
--- a/rpython/config/test/test_translationoption.py
+++ b/rpython/config/test/test_translationoption.py
@@ -1,3 +1,4 @@
+import sys
import py
from rpython.config.translationoption import get_combined_translation_config
from rpython.config.translationoption import set_opt_level
@@ -10,8 +11,8 @@
config.translation.gcrootfinder = "shadowstack"
py.test.raises(ConflictConfigError, set_opt_level, config, '0')
-if compiler.name == 'msvc':
+if compiler.name == 'msvc' or sys.platform == 'darwin':
def test_no_asmgcrot_on_msvc():
config = get_combined_translation_config()
- py.test.raises(ConfigError, config.translation.setoption,
- 'gcrootfinder', 'asmgcc', 'user')
+ config.translation.gcrootfinder = "asmgcc"
+ py.test.raises(ConfigError, set_opt_level, config, 'jit')
diff --git a/rpython/config/translationoption.py
b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -369,8 +369,8 @@
# disallow asmgcc on OS/X and on Win32
if config.translation.gcrootfinder == "asmgcc":
- assert sys.platform != "darwin", "'asmgcc' not supported on OS/X"
- assert sys.platform != "win32", "'asmgcc' not supported on Win32"
+ if sys.platform == "darwin" or sys.platform =="win32":
+ raise ConfigError("'asmgcc' not supported on this platform")
# ----------------------------------------------------------------
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
