From 5f2feac92c966a298a1a9fc1702dbc531e645424 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Mon, 6 Jan 2014 11:05:58 +0100
Subject: [PATCH] Remove install methods from mock packages (not needed)
---
lib/spack/spack/test/mock_packages/fake.py | 4 +--
.../spack/test/mock_packages/libdwarf.py | 33 +------------------
lib/spack/spack/test/mock_packages/mpich.py | 4 +--
.../spack/test/mock_packages/mpileaks.py | 4 +--
lib/spack/spack/test/mock_packages/zmpi.py | 4 +--
5 files changed, 5 insertions(+), 44 deletions(-)
diff --git a/lib/spack/spack/test/mock_packages/fake.py b/lib/spack/spack/test/mock_packages/fake.py
index c1356180e9..202e50cd9c 100644
--- a/lib/spack/spack/test/mock_packages/fake.py
+++ b/lib/spack/spack/test/mock_packages/fake.py
@@ -6,6 +6,4 @@ class Fake(Package):
versions = { '1.0' : 'foobarbaz' }
def install(self, spec, prefix):
- configure("--prefix=%s" % prefix)
- make()
- make("install")
+ pass
diff --git a/lib/spack/spack/test/mock_packages/libdwarf.py b/lib/spack/spack/test/mock_packages/libdwarf.py
index 1bb9fbc889..d8279b471a 100644
--- a/lib/spack/spack/test/mock_packages/libdwarf.py
+++ b/lib/spack/spack/test/mock_packages/libdwarf.py
@@ -16,36 +16,5 @@ class Libdwarf(Package):
depends_on("libelf")
- def clean(self):
- for dir in dwarf_dirs:
- with working_dir(dir):
- if os.path.exists('Makefile'):
- make('clean')
-
-
def install(self, spec, prefix):
- # dwarf build does not set arguments for ar properly
- make.add_default_arg('ARFLAGS=rcs')
-
- # Dwarf doesn't provide an install, so we have to do it.
- mkdirp(prefix.bin, prefix.include, prefix.lib, prefix.man1)
-
- with working_dir('libdwarf'):
- configure("--prefix=%s" % prefix, '--enable-shared')
- make()
-
- install('libdwarf.a', prefix.lib)
- install('libdwarf.so', prefix.lib)
- install('libdwarf.h', prefix.include)
- install('dwarf.h', prefix.include)
-
- with working_dir('dwarfdump2'):
- configure("--prefix=%s" % prefix)
-
- # This makefile has strings of copy commands that
- # cause a race in parallel
- make(parallel=False)
-
- install('dwarfdump', prefix.bin)
- install('dwarfdump.conf', prefix.lib)
- install('dwarfdump.1', prefix.man1)
+ pass
diff --git a/lib/spack/spack/test/mock_packages/mpich.py b/lib/spack/spack/test/mock_packages/mpich.py
index 351d224dc0..bf539c0bc7 100644
--- a/lib/spack/spack/test/mock_packages/mpich.py
+++ b/lib/spack/spack/test/mock_packages/mpich.py
@@ -16,6 +16,4 @@ class Mpich(Package):
provides('mpi@:1', when='@1:')
def install(self, spec, prefix):
- configure("--prefix=%s" % prefix)
- make()
- make("install")
+ pass
diff --git a/lib/spack/spack/test/mock_packages/mpileaks.py b/lib/spack/spack/test/mock_packages/mpileaks.py
index da71ff65bb..e7adb7549e 100644
--- a/lib/spack/spack/test/mock_packages/mpileaks.py
+++ b/lib/spack/spack/test/mock_packages/mpileaks.py
@@ -13,6 +13,4 @@ class Mpileaks(Package):
depends_on("callpath")
def install(self, spec, prefix):
- configure("--prefix=%s" % prefix)
- make()
- make("install")
+ pass
diff --git a/lib/spack/spack/test/mock_packages/zmpi.py b/lib/spack/spack/test/mock_packages/zmpi.py
index ec7e6fcdab..62ab6176cd 100644
--- a/lib/spack/spack/test/mock_packages/zmpi.py
+++ b/lib/spack/spack/test/mock_packages/zmpi.py
@@ -12,6 +12,4 @@ class Zmpi(Package):
depends_on('fake')
def install(self, spec, prefix):
- configure("--prefix=%s" % prefix)
- make()
- make("install")
+ pass
--
GitLab