[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] (no subject)
From: |
Yves Renard |
Subject: |
[Getfem-commits] (no subject) |
Date: |
Tue, 12 Sep 2017 09:32:27 -0400 (EDT) |
branch: master
commit 561b1551fb1878d3dac3a67f22c85db5ce532450
Author: Yves Renard <address@hidden>
Date: Tue Sep 12 15:32:09 2017 +0200
minor change : preload of the blas if found
---
interface/tests/matlab/check_all.sh | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/interface/tests/matlab/check_all.sh
b/interface/tests/matlab/check_all.sh
index c5c1156..06fa881 100755
--- a/interface/tests/matlab/check_all.sh
+++ b/interface/tests/matlab/check_all.sh
@@ -35,13 +35,16 @@ echo " export MATLABPATH=$MATLABPATH"
if test x$MATLAB_ROOT = x; then
- MLAB=matlab;
+ MLAB="matlab -nodesktop -nojvm -nosplash"
else
- MLAB=${MATLAB_ROOT}/bin/matlab
+ MLAB="${MATLAB_ROOT}/bin/matlab -nodesktop -nojvm -nosplash"
fi
-#echo "s=getenv('MATLABPATH'); while (length(s)), [a,s]=strtok(s,':');
addpath(a); end; disp(pwd); check_all; pause(1)" | ${MLAB} -nodesktop -nojvm
-nosplash;
-s=$(echo "s=getenv('MATLABPATH'); while (length(s)), [a,s]=strtok(s,':');
addpath(a); end; disp(pwd); check_all; pause(1)" | ${MLAB} -nodesktop -nojvm
-nosplash 2>&1);
+if [ -f "/usr/lib/libblas.so" ]; then
+ s=$(echo "s=getenv('MATLABPATH'); while (length(s)), [a,s]=strtok(s,':');
addpath(a); end; disp(pwd); check_all; pause(1)" |
LD_PRELOAD=/usr/lib/libblas.so ${MLAB} 2>&1);
+else
+ s=$(echo "s=getenv('MATLABPATH'); while (length(s)), [a,s]=strtok(s,':');
addpath(a); end; disp(pwd); check_all; pause(1)" | ${MLAB} 2>&1);
+fi
k=`echo "$s" | grep "All tests succeeded"`;
if test x"$k" = x""; then