[pypy-svn] r66062 - pypy/branch/pyjitpl5/pypy/config/test

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:38:57 2009
New Revision: 66062

Added:
   pypy/branch/pyjitpl5/pypy/config/test/test_config.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/config/test/test_config.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/config/test/test_config.py
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r64220 | pedronis | 2009-04-17 10:46:04 +0200 (Fri, 17 Apr 2009) | 1 line
    
    remove references to llvm
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/config/test/test_config.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/config/test/test_config.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/config/test/test_config.py	(original)
+++ pypy/branch/pyjitpl5/pypy/config/test/test_config.py.merge.tmp	Tue Jun 30 16:38:57 2009
@@ -299,11 +299,10 @@
         OptionDescription("s", '', [
             ChoiceOption("type_system", "", ["ll", "oo"], "ll"),
             ChoiceOption("backend", "",
-                         ["c", "llvm", "cli"], "llvm",
+                         ["c", "cli"], "c",
                          requires={
                              "c": [("s.type_system", "ll"),
                                    ("toplevel", True)],
-                             "llvm": [("s.type_system", "ll")],
                              "cli": [("s.type_system", "oo")],
                          })
         ])
@@ -314,7 +313,7 @@
 
 def test_choice_with_no_default():
     descr = OptionDescription("test", "", [
-        ChoiceOption("backend", "", ["c", "llvm"])])
+        ChoiceOption("backend", "", ["c", "cli"])])
     config = Config(descr)
     assert config.backend is None
     config.backend = "c"