summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2018-08-14 00:07:46 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2018-08-14 14:33:50 -0700
commit62026ce30272349c33c5ff9c8977e2db31d82203 (patch)
treed3dc80d3b3c7336d2284ae1c58ee473dd44c0fec /var
parent85d00c5ef4df6713d7f054b8e2d625d07cdd28af (diff)
downloadspack-62026ce30272349c33c5ff9c8977e2db31d82203.tar.gz
spack-62026ce30272349c33c5ff9c8977e2db31d82203.tar.bz2
spack-62026ce30272349c33c5ff9c8977e2db31d82203.tar.xz
spack-62026ce30272349c33c5ff9c8977e2db31d82203.zip
tests: make the dependency patching test more complete
- dependency patching test didn't attempt to apply patches; just to see whether they were on the spec. - it applies the patch now and verifies that that patch was applied.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin.mock/packages/patch-a-dependency/foo.patch1
-rw-r--r--var/spack/repos/builtin.mock/packages/patch-a-dependency/libelf.patch11
-rw-r--r--var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py2
3 files changed, 12 insertions, 2 deletions
diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/foo.patch b/var/spack/repos/builtin.mock/packages/patch-a-dependency/foo.patch
deleted file mode 100644
index 257cc5642c..0000000000
--- a/var/spack/repos/builtin.mock/packages/patch-a-dependency/foo.patch
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/libelf.patch b/var/spack/repos/builtin.mock/packages/patch-a-dependency/libelf.patch
new file mode 100644
index 0000000000..02bfad9103
--- /dev/null
+++ b/var/spack/repos/builtin.mock/packages/patch-a-dependency/libelf.patch
@@ -0,0 +1,11 @@
+--- patch-a-dependency/configure 2018-08-13 23:13:51.000000000 -0700
++++ patch-a-dependency/configure.patched 2018-08-13 23:14:15.000000000 -0700
+@@ -2,7 +2,7 @@
+ prefix=$(echo $1 | sed 's/--prefix=//')
+ cat > Makefile <<EOF
+ all:
+- echo Building...
++ echo Patched!
+
+ install:
+ mkdir -p $prefix
diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py
index 8d43739d07..01f13a98a2 100644
--- a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py
+++ b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py
@@ -33,7 +33,7 @@ class PatchADependency(Package):
version('1.0', '0123456789abcdef0123456789abcdef')
- depends_on('libelf', patches=patch('foo.patch'))
+ depends_on('libelf', patches=patch('libelf.patch'))
def install(self, spec, prefix):
pass