From eace068788956fbceb240f41949af54fa62db82c Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 24 Aug 2016 15:21:23 -0500 Subject: Use self.run_tests for make check --- var/spack/repos/builtin/packages/cmake/package.py | 3 ++- var/spack/repos/builtin/packages/expat/package.py | 3 ++- var/spack/repos/builtin/packages/jsoncpp/package.py | 3 ++- var/spack/repos/builtin/packages/libarchive/package.py | 3 ++- var/spack/repos/builtin/packages/libxml2/package.py | 3 ++- var/spack/repos/builtin/packages/lz4/package.py | 3 ++- var/spack/repos/builtin/packages/lzma/package.py | 3 ++- var/spack/repos/builtin/packages/lzo/package.py | 5 +++-- var/spack/repos/builtin/packages/nettle/package.py | 3 ++- var/spack/repos/builtin/packages/xz/package.py | 3 ++- var/spack/repos/builtin/packages/zlib/package.py | 3 ++- 11 files changed, 23 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 19b9b45d17..0c16adcef7 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -118,5 +118,6 @@ class Cmake(Package): bootstrap(*options) make() - # make('test') # some tests fail, takes forever + if self.run_tests: + make('test') # some tests fail, takes forever make('install') diff --git a/var/spack/repos/builtin/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py index 7e56bddd15..0262bf1e3f 100644 --- a/var/spack/repos/builtin/packages/expat/package.py +++ b/var/spack/repos/builtin/packages/expat/package.py @@ -38,5 +38,6 @@ class Expat(Package): configure('--prefix={0}'.format(prefix)) make() - make('check') + if self.run_tests: + make('check') make('install') diff --git a/var/spack/repos/builtin/packages/jsoncpp/package.py b/var/spack/repos/builtin/packages/jsoncpp/package.py index 77f18cb6ab..5169b338ee 100644 --- a/var/spack/repos/builtin/packages/jsoncpp/package.py +++ b/var/spack/repos/builtin/packages/jsoncpp/package.py @@ -44,5 +44,6 @@ class Jsoncpp(Package): cmake('..', '-DBUILD_SHARED_LIBS=ON', *std_cmake_args) make() - # make('test') # Python needed to run tests + if self.run_tests: + make('test') # Python needed to run tests make('install') diff --git a/var/spack/repos/builtin/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py index 6278563875..e439bf894f 100644 --- a/var/spack/repos/builtin/packages/libarchive/package.py +++ b/var/spack/repos/builtin/packages/libarchive/package.py @@ -52,5 +52,6 @@ class Libarchive(Package): configure('--prefix={0}'.format(prefix)) make() - # make('check') # cannot build test suite with Intel compilers + if self.run_tests: + make('check') # cannot build test suite with Intel compilers make('install') diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 6b25097bcd..0b55fe4d30 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -55,5 +55,6 @@ class Libxml2(Package): configure('--prefix={0}'.format(prefix), *python_args) make() - make('check') + if self.run_tests: + make('check') make('install') diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index 89356a607c..de7e566e70 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -40,5 +40,6 @@ class Lz4(Package): def install(self, spec, prefix): make() - # make('test') # requires valgrind to be installed + if self.run_tests: + make('test') # requires valgrind to be installed make('install', 'PREFIX={0}'.format(prefix)) diff --git a/var/spack/repos/builtin/packages/lzma/package.py b/var/spack/repos/builtin/packages/lzma/package.py index f363569930..23d697ffe8 100644 --- a/var/spack/repos/builtin/packages/lzma/package.py +++ b/var/spack/repos/builtin/packages/lzma/package.py @@ -44,5 +44,6 @@ class Lzma(Package): configure('--prefix={0}'.format(prefix)) make() - make('check') + if self.run_tests: + make('check') # one of the tests fails for me make('install') diff --git a/var/spack/repos/builtin/packages/lzo/package.py b/var/spack/repos/builtin/packages/lzo/package.py index 7702186cbd..172e57d0cd 100644 --- a/var/spack/repos/builtin/packages/lzo/package.py +++ b/var/spack/repos/builtin/packages/lzo/package.py @@ -45,6 +45,7 @@ class Lzo(Package): ] configure(*configure_args) make() - make('check') - make('test') # more exhaustive test + if self.run_tests: + make('check') + make('test') # more exhaustive test make('install') diff --git a/var/spack/repos/builtin/packages/nettle/package.py b/var/spack/repos/builtin/packages/nettle/package.py index bf49423605..b4c873a8a1 100644 --- a/var/spack/repos/builtin/packages/nettle/package.py +++ b/var/spack/repos/builtin/packages/nettle/package.py @@ -41,5 +41,6 @@ class Nettle(Package): configure('--prefix={0}'.format(prefix)) make() - make('check') + if self.run_tests: + make('check') make('install') diff --git a/var/spack/repos/builtin/packages/xz/package.py b/var/spack/repos/builtin/packages/xz/package.py index 815d898504..8b0609f50e 100644 --- a/var/spack/repos/builtin/packages/xz/package.py +++ b/var/spack/repos/builtin/packages/xz/package.py @@ -40,5 +40,6 @@ class Xz(Package): configure('--prefix={0}'.format(prefix)) make() - make('check') + if self.run_tests: + make('check') make('install') diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index 8834a05804..6f4d8a5bb8 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -38,5 +38,6 @@ class Zlib(Package): configure('--prefix={0}'.format(prefix)) make() - make('test') + if self.run_tests: + make('test') make('install') -- cgit v1.2.3-70-g09d2