improving the check

sagemath · Apr 5, 2018 · e94b94e · e94b94e
1 parent b86cf01
commit e94b94e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/build/pkgs/scipoptsuite/spkg-check b/build/pkgs/scipoptsuite/spkg-check
@@ -4,23 +4,13 @@ if [ "$SAGE_LOCAL" = "" ]; then
    exit 1
 fi
 
-cd src
-
-# Choice of OPT should be consistent with spkg-install
-OPT=opt
-if [ `uname` = 'Darwin' ] ; then
-    OPT=dbg
-fi
+cd src/build/
 
 echo "Now running the SCIP test suite..."
 # Do the tests with the installed version of SCIP.
 # (The uninstalled ones do not work because we did not adjust their library dependencies.)
-$MAKE check OPT=$OPT MAINFILE="$SAGE_LOCAL"/bin/scip | tee testsuite.log
+$MAKE check MAINFILE="$SAGE_LOCAL"/bin/scip | tee testsuite.log
 if [ $? -ne 0 ]; then
     echo >&2 "Error: The SCIP test suite failed with an error status."
     exit 1
 fi
-if grep -q fail testsuite.log ; then
-    echo >&2 "Error: The SCIP test suite failed."
-    exit 1
-fi
diff --git a/build/pkgs/scipoptsuite/spkg-install b/build/pkgs/scipoptsuite/spkg-install
@@ -11,7 +11,6 @@ mkdir build
 cd build
 cmake .. -DCMAKE_INSTALL_PREFIX="$SAGE_LOCAL"/ -DCMAKE_VERBOSE_MAKEFILE=ON
 make
-make check
 make install
 
 $SAGE_LOCAL/bin/scip -s /dev/null -c quit
@@ -22,4 +21,4 @@ if [ $? -ne 0 ]; then
 fi
 
 
-echo "finished building Scipoptsuite"
+echo "Finished building scipoptsuite"