diff --git a/test_problems/ChemEquil_ionizedGas/Makefile.in b/test_problems/ChemEquil_ionizedGas/Makefile.in index 8ae6b465a..a9d0c59dc 100644 --- a/test_problems/ChemEquil_ionizedGas/Makefile.in +++ b/test_problems/ChemEquil_ionizedGas/Makefile.in @@ -34,8 +34,7 @@ os_is_win = @OS_IS_WIN@ FORT_LIBS = @FLIBS@ # Executables extension -extension = @EXE_EXT@ -extension2 = @EXEEXT@ +EXE_EXT = @EXE_EXT@ # the C++ compiler CXX = @CXX@ diff --git a/test_problems/VCSnonideal/NaCl_equil/runtest b/test_problems/VCSnonideal/NaCl_equil/runtest index 048d3d4f2..6397b25f6 100755 --- a/test_problems/VCSnonideal/NaCl_equil/runtest +++ b/test_problems/VCSnonideal/NaCl_equil/runtest @@ -19,7 +19,7 @@ BINDIR=../../../bin ################################################################# MPEQUIL_EXE=${MPEQUIL_EXE:=nacl_equil} -$MPEQUIL_EXE -d 3 > out.txt 2>err_out.txt +./$MPEQUIL_EXE -d 3 > out.txt 2>err_out.txt retnStat=$? if test $retnStat != "0" then diff --git a/test_problems/VCSnonideal/NaCl_equil/runtestd b/test_problems/VCSnonideal/NaCl_equil/runtestd index fb8268201..7ef61644b 100755 --- a/test_problems/VCSnonideal/NaCl_equil/runtestd +++ b/test_problems/VCSnonideal/NaCl_equil/runtestd @@ -19,7 +19,7 @@ BINDIR=../../../bin ################################################################# MPEQUIL_EXE=${MPEQUIL_EXE:=nacl_equil} -$MPEQUIL_EXE -d 5 > dout.txt 2>err_dout.txt +./$MPEQUIL_EXE -d 5 > dout.txt 2>err_dout.txt retnStat=$? if test $retnStat != "0" then diff --git a/test_problems/cathermo/DH_graph_1/runtest b/test_problems/cathermo/DH_graph_1/runtest index 32cd6637e..eab6203ec 100755 --- a/test_problems/cathermo/DH_graph_1/runtest +++ b/test_problems/cathermo/DH_graph_1/runtest @@ -26,7 +26,7 @@ fi /bin/rm -f test.out test.diff DH_graph_1.csv # echo 'Testing the DH dilute act calculation - act vs I' -$prog DH_NaCl_dilute.xml > DH_graph_1.csv +./$prog DH_NaCl_dilute.xml > DH_graph_1.csv retnStat=$? diff DH_graph_1.csv DH_NaCl_dilute_blessed.csv > diff.out zres=$? diff --git a/test_problems/cathermo/DH_graph_NM/runtest b/test_problems/cathermo/DH_graph_NM/runtest index 0ae880f0f..104cdfdd8 100755 --- a/test_problems/cathermo/DH_graph_NM/runtest +++ b/test_problems/cathermo/DH_graph_NM/runtest @@ -26,7 +26,7 @@ fi ########################################################################## /bin/rm -f test.out test.diff DH_NaCl_NM.csv -$prog DH_NaCl_NM.xml > DH_NaCl_NM.csv +./$prog DH_NaCl_NM.xml > DH_NaCl_NM.csv retnStat=$? diff DH_NaCl_NM.csv DH_NaCl_NM_blessed.csv > output.txt zres=$? diff --git a/test_problems/cathermo/DH_graph_Pitzer/runtest b/test_problems/cathermo/DH_graph_Pitzer/runtest index 77f39f2ab..977c5b988 100755 --- a/test_problems/cathermo/DH_graph_Pitzer/runtest +++ b/test_problems/cathermo/DH_graph_Pitzer/runtest @@ -26,7 +26,7 @@ fi ########################################################################## /bin/rm -f test.out test.diff DH_NaCl_Pitzer.csv -$prog DH_NaCl_Pitzer.xml > DH_NaCl_Pitzer.csv +./$prog DH_NaCl_Pitzer.xml > DH_NaCl_Pitzer.csv retnStat=$? diff DH_NaCl_Pitzer.csv DH_NaCl_Pitzer_blessed.csv > output.txt zres=$? diff --git a/test_problems/cathermo/DH_graph_acommon/runtest b/test_problems/cathermo/DH_graph_acommon/runtest index 16198696c..08a052cb8 100755 --- a/test_problems/cathermo/DH_graph_acommon/runtest +++ b/test_problems/cathermo/DH_graph_acommon/runtest @@ -26,7 +26,7 @@ fi ########################################################################## /bin/rm -f test.out test.diff DH_NaCl_acommon.csv -$prog DH_NaCl_acommon.xml > DH_NaCl_acommon.csv +./$prog DH_NaCl_acommon.xml > DH_NaCl_acommon.csv retnStat=$? diff DH_NaCl_acommon.csv DH_NaCl_acommon_blessed.csv > output.txt zres=$? diff --git a/test_problems/cathermo/DH_graph_bdotak/runtest b/test_problems/cathermo/DH_graph_bdotak/runtest index 27e763931..156aeb5d4 100755 --- a/test_problems/cathermo/DH_graph_bdotak/runtest +++ b/test_problems/cathermo/DH_graph_bdotak/runtest @@ -26,7 +26,7 @@ fi ########################################################################## /bin/rm -f test.out test.diff DH_NaCl_bdotak.csv -$prog DH_NaCl_bdotak.xml > DH_NaCl_bdotak.csv +./$prog DH_NaCl_bdotak.xml > DH_NaCl_bdotak.csv retnStat=$? diff DH_NaCl_bdotak.csv DH_NaCl_bdotak_blessed.csv > output.txt zres=$? diff --git a/test_problems/cathermo/HMW_dupl_test/runtest b/test_problems/cathermo/HMW_dupl_test/runtest index d70ba78ed..a85fe7f7b 100755 --- a/test_problems/cathermo/HMW_dupl_test/runtest +++ b/test_problems/cathermo/HMW_dupl_test/runtest @@ -20,7 +20,7 @@ CANTERA_BIN=${CANTERA_BIN:=../../../bin} ################################################################# -$prog HMW_NaCl_sp1977_alt.xml > output.txt +./$prog HMW_NaCl_sp1977_alt.xml > output.txt retnStat=$? if [ $retnStat != "0" ] then diff --git a/test_problems/cathermo/HMW_graph_CpvT/runtest b/test_problems/cathermo/HMW_graph_CpvT/runtest index cee966321..4765bb7c5 100755 --- a/test_problems/cathermo/HMW_graph_CpvT/runtest +++ b/test_problems/cathermo/HMW_graph_CpvT/runtest @@ -20,7 +20,7 @@ CANTERA_BIN=${CANTERA_BIN:=../../../bin} ################################################################# -$prog HMW_NaCl_sp1977_alt.xml > output.txt +./$prog HMW_NaCl_sp1977_alt.xml > output.txt retnStat=$? if [ $retnStat != "0" ] then diff --git a/test_problems/cathermo/HMW_graph_GvI/runtest b/test_problems/cathermo/HMW_graph_GvI/runtest index a6f670c4d..5e2d16da2 100755 --- a/test_problems/cathermo/HMW_graph_GvI/runtest +++ b/test_problems/cathermo/HMW_graph_GvI/runtest @@ -21,7 +21,7 @@ CANTERA_BIN=${CANTERA_BIN:=../../../bin} ################################################################# -$prog > output.txt +./$prog > output.txt retnStat=$? if [ $retnStat != "0" ] then diff --git a/test_problems/cathermo/HMW_graph_GvT/runtest b/test_problems/cathermo/HMW_graph_GvT/runtest index e08a57210..8a133245b 100755 --- a/test_problems/cathermo/HMW_graph_GvT/runtest +++ b/test_problems/cathermo/HMW_graph_GvT/runtest @@ -20,7 +20,7 @@ CANTERA_BIN=${CANTERA_BIN:=../../../bin} ################################################################# -$prog HMW_NaCl_sp1977_alt.xml > output.txt +./$prog HMW_NaCl_sp1977_alt.xml > output.txt retnStat=$? if [ $retnStat != "0" ] then diff --git a/test_problems/cathermo/HMW_graph_VvT/runtest b/test_problems/cathermo/HMW_graph_VvT/runtest index 7d2c4b3a2..cdfc8f4d4 100755 --- a/test_problems/cathermo/HMW_graph_VvT/runtest +++ b/test_problems/cathermo/HMW_graph_VvT/runtest @@ -20,7 +20,7 @@ CANTERA_BIN=${CANTERA_BIN:=../../../bin} ################################################################# -$prog HMW_NaCl_sp1977_alt.xml > output.txt +./$prog HMW_NaCl_sp1977_alt.xml > output.txt retnStat=$? if [ $retnStat != "0" ] then diff --git a/test_problems/cathermo/HMW_test_1/runtest b/test_problems/cathermo/HMW_test_1/runtest index 3abd83ecf..3e963c89e 100755 --- a/test_problems/cathermo/HMW_test_1/runtest +++ b/test_problems/cathermo/HMW_test_1/runtest @@ -21,7 +21,7 @@ CANTERA_BIN=${CANTERA_BIN:=../../../bin} ################################################################# -$prog > output.txt +./$prog > output.txt retnStat=$? if [ $retnStat != "0" ] then diff --git a/test_problems/cathermo/HMW_test_3/runtest b/test_problems/cathermo/HMW_test_3/runtest index 5994c88d6..f6f9fad52 100755 --- a/test_problems/cathermo/HMW_test_3/runtest +++ b/test_problems/cathermo/HMW_test_3/runtest @@ -21,7 +21,7 @@ CANTERA_BIN=${CANTERA_BIN:=../../../bin} ################################################################# -$prog > output.txt +./$prog > output.txt retnStat=$? if [ $retnStat != "0" ] then diff --git a/test_problems/cathermo/stoichSubSSTP/runtest b/test_problems/cathermo/stoichSubSSTP/runtest index 49933c3a1..68358d859 100755 --- a/test_problems/cathermo/stoichSubSSTP/runtest +++ b/test_problems/cathermo/stoichSubSSTP/runtest @@ -20,7 +20,7 @@ CANTERA_BIN=${CANTERA_BIN:=../../../bin} ################################################################# -$prog > output.txt +./$prog > output.txt retnStat=$? if [ $retnStat != "0" ] then