Improve check

* Disable the out of source build to run the test
* Skip some test

1 files changed, 19 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ec6ba9414515..f725ef9c6dfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,26 +12,31 @@ arch=('i686' 'x86_64')
 depends=('qt4' 'python2' 'szip' 'hdf5')
 makedepends=('gcc-fortran')
 license=('BSD' 'custom')
-source=(https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('3af87e5f0608a69849c00eb7c73b11f8422fa36903dd14610584506e7f68e638')
+source=("https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        "${pkgname}-${pkgver}-rocket-test.patch"
+        "${pkgname}-${pkgver}-skip-test.patch")
+sha256sums=('3af87e5f0608a69849c00eb7c73b11f8422fa36903dd14610584506e7f68e638'
+            'd66a7a47c4dbb3be20fe3d35275a38de7e23c7b6d7927627255f7a5d49aefb47'
+            '414b39df3d60bd897ea7f19c28314e8c9fae56106a0962d9116fc65aef9aba2f')
 
 _install_docs=1
 
 prepare(){
-  cd "${srcdir}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Out of source build
-  rm -rf -- build
-  mkdir -p -- build
+  patch tests/Makefile.in < "${srcdir}/${pkgname}-${pkgver}-rocket-test.patch"
+  # Disable szip test as extra/hdf5 is not linked to szip,
+  # also disable test 46 (write object from python module)
+  patch tests/testsuite.at < "${srcdir}/${pkgname}-${pkgver}-skip-test.patch"
 }
 
 build() {
-  cd "${srcdir}/build"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   export PYTHON=/usr/bin/python2
   if [ "$(pacman -Qs hdf- | grep  -o mpi)" == "mpi" ]
   then
-    ../${pkgname}-${pkgver}/configure \
+    ./configure \
       --prefix=/usr \
       --enable-shared --enable-optimization \
       --enable-fortran --enable-browser \
@@ -45,7 +50,7 @@ build() {
       --enable-install-lite-headers \
       --enable-hzip --enable-fpzip
   else
-    ../${pkgname}-${pkgver}/configure \
+    ./configure \
       --prefix=/usr \
       --enable-shared --enable-optimization \
       --enable-fortran --enable-browser \
@@ -65,19 +70,15 @@ build() {
 }
 
 check(){
-  cd "${srcdir}/build/tests"
-
-  # Quick test
-  make testall
-  ./testall
+  cd "${srcdir}/${pkgname}-${pkgver}/tests"
 
-  # All tests, but tests 33 (rocket) and 46 (write objects) failed,
-  # and they all failed with an out of source build
-  #make check PYTHON=/usr/bin/python2 BROWSER="${srcdir}/${pkgname}-${pkgver}/build/tools/browser"
+  export PYTHON=/usr/bin/python2
+  export BROWSER="${srcdir}/${pkgname}-${pkgver}/tools/browser"
+  make check
 }
 
 package(){
-  cd "${srcdir}/build"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install