summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Davydov <davydden@gmail.com>2016-05-11 15:02:14 +0200
committerDenis Davydov <davydden@gmail.com>2016-05-11 15:10:13 +0200
commit809ded74c99ac6883bc5b5e4c7a2da887131360c (patch)
tree8329825d0c4c76c72f3031f70910d64f99a4aab0
parent9030541e4bc3a77f90d16969b6fff0afa387847c (diff)
downloadspack-809ded74c99ac6883bc5b5e4c7a2da887131360c.tar.gz
spack-809ded74c99ac6883bc5b5e4c7a2da887131360c.tar.bz2
spack-809ded74c99ac6883bc5b5e4c7a2da887131360c.tar.xz
spack-809ded74c99ac6883bc5b5e4c7a2da887131360c.zip
add functions for simple unit tests; refactor openblas to use them
-rw-r--r--lib/spack/spack/package_test.py64
-rw-r--r--var/spack/repos/builtin/packages/openblas/package.py39
2 files changed, 72 insertions, 31 deletions
diff --git a/lib/spack/spack/package_test.py b/lib/spack/spack/package_test.py
new file mode 100644
index 0000000000..4b021684ee
--- /dev/null
+++ b/lib/spack/spack/package_test.py
@@ -0,0 +1,64 @@
+##############################################################################
+# Copyright (c) 2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+import os
+
+def compile_c_and_execute(source_file,include_flags, link_flags):
+ """Compile C @p source_file with @p include_flags and @p link_flags,
+ run and return the output.
+ """
+ cc = which('cc')
+ flags = include_flags
+ flags.extend([source_file])
+ cc('-c', *flags)
+ name = os.path.splitext(os.path.basename(source_file))[0]
+ cc('-o', "check", "%s.o" % name,
+ *link_flags)
+
+ check = Executable('./check')
+ return check(return_output=True)
+
+
+def compare_output(current_output, blessed_output):
+ """Compare blessed and current output of executables."""
+ if not (current_output == blessed_output):
+ print "Produced output does not match expected output."
+ print "Expected output:"
+ print '-'*80
+ print blessed_output
+ print '-'*80
+ print "Produced output:"
+ print '-'*80
+ print current_output
+ print '-'*80
+ raise RuntimeError("Ouput check failed. See spack_output.log for details")
+
+
+def compare_output_file(current_output, blessed_output_file):
+ """Same as above, but when the blessed output is given as a file."""
+ with open(blessed_output_file, 'r') as f:
+ blessed_output = f.read()
+
+ compare_output(current_output,blessed_output)
diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py
index d147533491..47b30181a8 100644
--- a/var/spack/repos/builtin/packages/openblas/package.py
+++ b/var/spack/repos/builtin/packages/openblas/package.py
@@ -1,4 +1,5 @@
from spack import *
+from spack.package_test import *
import sys
import os
import shutil
@@ -94,42 +95,18 @@ class Openblas(Package):
self.spec.lapack_shared_lib = self.spec.blas_shared_lib
def check_install(self, spec):
- # TODO: Pull this out to the framework function which recieves a pair of xyz.c and xyz.output
- print "Checking Openblas installation..."
source_file = join_path(os.path.dirname(self.module.__file__),
'test_cblas_dgemm.c')
- output_file = join_path(os.path.dirname(self.module.__file__),
- 'test_cblas_dgemm.output')
+ blessed_file = join_path(os.path.dirname(self.module.__file__),
+ 'test_cblas_dgemm.output')
- with open(output_file, 'r') as f:
- expected = f.read()
-
- cc = which('cc')
- cc('-c', "-I%s" % join_path(spec.prefix, "include"), source_file)
+ include_flags = ["-I%s" % join_path(spec.prefix, "include")]
link_flags = ["-L%s" % join_path(spec.prefix, "lib"),
"-llapack",
"-lblas",
- "-lpthread"
- ]
+ "-lpthread"]
if '+openmp' in spec:
link_flags.extend([self.compiler.openmp_flag])
- cc('-o', "check", "test_cblas_dgemm.o",
- *link_flags)
-
- try:
- check = Executable('./check')
- output = check(return_output=True)
- except:
- output = ""
- success = output == expected
- if not success:
- print "Produced output does not match expected output."
- print "Expected output:"
- print '-'*80
- print expected
- print '-'*80
- print "Produced output:"
- print '-'*80
- print output
- print '-'*80
- raise RuntimeError("Openblas install check failed")
+
+ output = compile_c_and_execute(source_file,include_flags,link_flags)
+ compare_output_file(output,blessed_file)