From 5417f1cdc676ab6c244cce1f3594a9620ba24b16 Mon Sep 17 00:00:00 2001
From: Gregory Becker <becker33@llnl.gov>
Date: Wed, 18 May 2016 17:21:03 -0700
Subject: more merge work

---
 lib/spack/spack/test/__init__.py    | 40 ++-----------------------------------
 lib/spack/spack/test/multimethod.py | 22 ++------------------
 2 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/lib/spack/spack/test/__init__.py b/lib/spack/spack/test/__init__.py
index cac7c2f058..480e6290e7 100644
--- a/lib/spack/spack/test/__init__.py
+++ b/lib/spack/spack/test/__init__.py
@@ -31,8 +31,8 @@ from llnl.util.filesystem import join_path
 from llnl.util.tty.colify import colify
 from spack.test.tally_plugin import Tally
 """Names of tests to be included in Spack's test suite"""
-#ifdef NEW
-test_names = ['versions', 'url_parse', 'url_substitution', 'packages', 'stage',
+
+test_names = ['architecture', 'versions', 'url_parse', 'url_substitution', 'packages', 'stage',
               'spec_syntax', 'spec_semantics', 'spec_dag', 'concretize',
               'multimethod', 'install', 'package_sanity', 'config',
               'directory_layout', 'pattern', 'python_version', 'git_fetch',
@@ -41,42 +41,6 @@ test_names = ['versions', 'url_parse', 'url_substitution', 'packages', 'stage',
               'make_executable', 'configure_guess', 'lock', 'database',
               'namespace_trie', 'yaml', 'sbang', 'environment',
               'cmd.uninstall', 'cmd.test_install']
-#else /* not NEW */
-test_names = ['architecture',
-              'versions',
-              'url_parse',
-              'url_substitution',
-              'packages',
-              'stage',
-              'spec_syntax',
-              'spec_semantics',
-              'spec_dag',
-              'concretize',
-              'multimethod',
-              'install',
-              'package_sanity',
-              'config',
-              'directory_layout',
-              'pattern',
-              'python_version',
-              'git_fetch',
-              'svn_fetch',
-              'hg_fetch',
-              'mirror',
-              'url_extrapolate',
-              'cc',
-              'link_tree',
-              'spec_yaml',
-              'optional_deps',
-              'make_executable',
-              'configure_guess',
-              'unit_install',
-              'lock',
-              'database',
-              'namespace_trie',
-              'yaml',
-              'sbang']
-#endif /* not NEW */
 
 
 def list_tests():
diff --git a/lib/spack/spack/test/multimethod.py b/lib/spack/spack/test/multimethod.py
index 7636bd6c38..034e6b3923 100644
--- a/lib/spack/spack/test/multimethod.py
+++ b/lib/spack/spack/test/multimethod.py
@@ -92,36 +92,18 @@ class MultiMethodTest(MockPackagesTest):
         self.assertEqual(pkg.has_a_default(), 'default')
 
 
-#ifdef NEW
-    def test_architecture_match(self):
-        pkg = spack.repo.get('multimethod arch=x86_64')
-        self.assertEqual(pkg.different_by_architecture(), 'x86_64')
-
-        pkg = spack.repo.get('multimethod arch=ppc64')
-        self.assertEqual(pkg.different_by_architecture(), 'ppc64')
-
-        pkg = spack.repo.get('multimethod arch=ppc32')
-        self.assertEqual(pkg.different_by_architecture(), 'ppc32')
-
-        pkg = spack.repo.get('multimethod arch=arm64')
-        self.assertEqual(pkg.different_by_architecture(), 'arm64')
-
-        pkg = spack.repo.get('multimethod arch=macos')
-        self.assertRaises(NoSuchMethodError, pkg.different_by_architecture)
-#else /* not NEW */
     def test_target_match(self):
         platform = spack.architecture.sys_type()
         targets = platform.targets.values()
         for target in targets[:-1]:
-            pkg = spack.repo.get('multimethod='+target.name)
+            pkg = spack.repo.get('multimethod target='+target.name)
             self.assertEqual(pkg.different_by_target(), target.name)
 
-        pkg = spack.repo.get('multimethod='+targets[-1].name)
+        pkg = spack.repo.get('multimethod target='+targets[-1].name)
         if len(targets) == 1:
             self.assertEqual(pkg.different_by_target(), targets[-1].name)
         else:
             self.assertRaises(NoSuchMethodError, pkg.different_by_target)
-#endif /* not NEW */
 
 
     def test_dependency_match(self):
-- 
cgit v1.2.3-70-g09d2