CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed autotest scripts to work when '.' is not in the user's path

Browse Source
This commit is contained in:
Rob Falgout 2017-05-16 11:26:35 -07:00
parent 2b8442ba6d
commit 08d6833cd2
6 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTOTEST/cmaketest.sh
View File

@ -123,5 +123,5 @@ cd $src_dir
rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'`
rm -fr `echo test/cmbuild/* | sed 's/[^ ]*README.txt//g'`
rm -fr hypre
( cd $src_dir/test; rm -f $drivers; cleantest.sh )
( cd $src_dir/test; rm -f $drivers; ./cleantest.sh )

12
AUTOTEST/machine-mac.sh
View File

@ -51,16 +51,16 @@ mo="test"
ro="-ams -ij -sstruct -struct -rt -D HYPRE_NO_SAVED"
co="--disable-fortran"
test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro
renametest.sh basictest $output_dir/basictest-default
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro
./renametest.sh basictest $output_dir/basictest-default
co="--enable-debug --disable-fortran"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--enable-debug
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--enable-debug
co="--enable-bigint --disable-fortran"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--enable-bigint
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--enable-bigint
# Test linking for different languages
link_opts="all++"

16
AUTOTEST/machine-rzmerl.sh
View File

@ -47,21 +47,21 @@ mo="test"
ro="-ams -ij -sstruct -struct -rt -D HYPRE_NO_SAVED"
co=""
test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro
renametest.sh basictest $output_dir/basictest-default
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro
./renametest.sh basictest $output_dir/basictest-default
co="--with-openmp"
RO="-ams -ij -sstruct -struct -rt -D HYPRE_NO_SAVED -nthreads 2"
test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $RO
renametest.sh basictest $output_dir/basictest--with-openmp
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $RO
./renametest.sh basictest $output_dir/basictest--with-openmp
co="--enable-debug"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--enable-debug
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--enable-debug
co="--enable-bigint"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--enable-bigint
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--enable-bigint
# Test linking for different languages
link_opts="all++ all77"

16
AUTOTEST/machine-rzzeus.sh
View File

@ -47,20 +47,20 @@ mo="test"
ro="-ams -ij -sstruct -struct -rt -D HYPRE_NO_SAVED"
co=""
test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro
renametest.sh basictest $output_dir/basictest-default
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro
./renametest.sh basictest $output_dir/basictest-default
co="--enable-debug"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--enable-debug
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--enable-debug
co="--enable-bigint"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--enable-bigint
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--enable-bigint
co="--with-blas --with-lapack --with-blas-lib-dirs=/usr/lib64 --with-lapack-lib-dirs=/usr/lib64 --with-blas-libs=blas --with-lapack-libs=lapack"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--with-blas
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--with-blas
# Test linking for different languages
link_opts="all++ all77"

80
AUTOTEST/machine-tux.sh
View File

@ -49,67 +49,67 @@ ro="-ams -ij -sstruct -struct"
eo=""
co=""
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest-default
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest-default
co="--enable-debug"
test.sh basictest.sh $src_dir -co: $co -mo: $mo -eo: $eo
renametest.sh basictest $output_dir/basictest-debug1
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -eo: $eo
./renametest.sh basictest $output_dir/basictest-debug1
co="--enable-debug --enable-global-partition"
RO="-fac"
test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $RO -eo: $eo
renametest.sh basictest $output_dir/basictest-debug2
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $RO -eo: $eo
./renametest.sh basictest $output_dir/basictest-debug2
co="--enable-debug CC=mpiCC"
test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro -eo: $eo
renametest.sh basictest $output_dir/basictest-debug-cpp
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro -eo: $eo
./renametest.sh basictest $output_dir/basictest-debug-cpp
# co="--with-insure --enable-debug --with-print-errors"
# MO="test"
# test.sh basictest.sh $src_dir -co: $co -mo: $MO -ro: $ro
# renametest.sh basictest $output_dir/basictest--with-insure1
# ./test.sh basictest.sh $src_dir -co: $co -mo: $MO -ro: $ro
# ./renametest.sh basictest $output_dir/basictest--with-insure1
#
# co="--with-insure --enable-debug --enable-global-partition"
# MO="test"
# test.sh basictest.sh $src_dir -co: $co -mo: $MO -ro: $ro
# renametest.sh basictest $output_dir/basictest--with-insure2
# ./test.sh basictest.sh $src_dir -co: $co -mo: $MO -ro: $ro
# ./renametest.sh basictest $output_dir/basictest--with-insure2
co="--enable-debug --with-print-errors"
test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro -rt -valgrind
renametest.sh basictest $output_dir/basictest--valgrind1
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro -rt -valgrind
./renametest.sh basictest $output_dir/basictest--valgrind1
co="--enable-debug --enable-global-partition"
test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro -rt -valgrind
renametest.sh basictest $output_dir/basictest--valgrind2
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro -rt -valgrind
./renametest.sh basictest $output_dir/basictest--valgrind2
co="--without-MPI"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--without-MPI
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--without-MPI
co="--with-strict-checking"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--with-strict-checking
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--with-strict-checking
co="--enable-shared"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--enable-shared
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--enable-shared
co="--enable-bigint --enable-debug"
test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro -eo: -bigint
renametest.sh basictest $output_dir/basictest--enable-bigint
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro -eo: -bigint
./renametest.sh basictest $output_dir/basictest--enable-bigint
co="--enable-maxdim=4 --enable-debug"
test.sh basictest.sh $src_dir -co: $co -mo: $mo -eo: -maxdim
renametest.sh basictest $output_dir/basictest--enable-maxdim=4
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -eo: -maxdim
./renametest.sh basictest $output_dir/basictest--enable-maxdim=4
co="--enable-complex --enable-maxdim=4 --enable-debug"
test.sh basictest.sh $src_dir -co: $co -mo: $mo -eo: -complex
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -eo: -complex
# ignore complex compiler output for now
rm -fr basictest.dir/make.???
grep -v make.err basictest.err > basictest.tmp
mv basictest.tmp basictest.err
renametest.sh basictest $output_dir/basictest--enable-complex
./renametest.sh basictest $output_dir/basictest--enable-complex
# CMake build and run tests
mo="-j"
@ -117,28 +117,28 @@ ro="-ams -ij -sstruct -struct"
eo=""
co=""
test.sh cmaketest.sh $src_dir -co: $co -mo: $mo
renametest.sh cmaketest $output_dir/cmaketest-default
./test.sh cmaketest.sh $src_dir -co: $co -mo: $mo
./renametest.sh cmaketest $output_dir/cmaketest-default
co="-DCMAKE_BUILD_TYPE=Debug"
test.sh cmaketest.sh $src_dir -co: $co -mo: $mo -ro: $ro
renametest.sh cmaketest $output_dir/cmaketest-debug
./test.sh cmaketest.sh $src_dir -co: $co -mo: $mo -ro: $ro
./renametest.sh cmaketest $output_dir/cmaketest-debug
co="-DHYPRE_NO_GLOBAL_PARTITION=OFF"
test.sh cmaketest.sh $src_dir -co: $co -mo: $mo
renametest.sh cmaketest $output_dir/cmaketest-global-partition
./test.sh cmaketest.sh $src_dir -co: $co -mo: $mo
./renametest.sh cmaketest $output_dir/cmaketest-global-partition
co="-DHYPRE_SEQUENTIAL=ON"
test.sh cmaketest.sh $src_dir -co: $co -mo: $mo
renametest.sh cmaketest $output_dir/cmaketest-sequential
./test.sh cmaketest.sh $src_dir -co: $co -mo: $mo
./renametest.sh cmaketest $output_dir/cmaketest-sequential
co="-DHYPRE_SHARED=ON"
test.sh cmaketest.sh $src_dir -co: $co -mo: $mo
renametest.sh cmaketest $output_dir/cmaketest-shared
./test.sh cmaketest.sh $src_dir -co: $co -mo: $mo
./renametest.sh cmaketest $output_dir/cmaketest-shared
co="-DHYPRE_BIGINT=ON"
test.sh cmaketest.sh $src_dir -co: $co -mo: $mo -ro: $ro
renametest.sh cmaketest $output_dir/cmaketest-bigint
./test.sh cmaketest.sh $src_dir -co: $co -mo: $mo -ro: $ro
./renametest.sh cmaketest $output_dir/cmaketest-bigint
# cmake build doesn't currently support maxdim
# cmake build doesn't currently support complex

12
AUTOTEST/machine-vulcan.sh
View File

@ -47,16 +47,16 @@ mo="test"
ro="-ams -ij -sstruct -struct -rt -D HYPRE_NO_SAVED"
co=""
test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro
renametest.sh basictest $output_dir/basictest-default
./test.sh basictest.sh $src_dir -co: $co -mo: $mo -ro: $ro
./renametest.sh basictest $output_dir/basictest-default
co="--enable-debug"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--enable-debug
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--enable-debug
co="--enable-bigint"
test.sh basictest.sh $src_dir -co: $co -mo: $mo
renametest.sh basictest $output_dir/basictest--enable-bigint
./test.sh basictest.sh $src_dir -co: $co -mo: $mo
./renametest.sh basictest $output_dir/basictest--enable-bigint
# Test linking for different languages
link_opts="all++ all77"