From d9ebe53fa6e97b0a3cadaa7d2bfa81f7d3bc03ae Mon Sep 17 00:00:00 2001 From: LOFAR <sdos@astron.nl> Date: Tue, 7 Mar 2006 09:41:16 +0000 Subject: [PATCH] BugID: 663 Added $LOFAR_CHECKTOOL to all test .run programs --- CEP/BB/BBS3/test/tBBS3.run | 2 +- CEP/BB/BBS3/test/tCorrect.run | 2 +- CEP/BB/BBS3/test/tMSData.run | 4 ++-- CEP/BB/BBS3/test/tPerturbed.run | 8 ++++---- CEP/BB/BBS3/test/tPredSolv.run | 2 +- CEP/BB/BBS3/test/tPredict.run | 2 +- CEP/BB/BBS3/test/tSubtract.run | 2 +- CEP/BB/BDBReplication/test/tBDBReplication.run | 4 ++-- CEP/BB/MS/test/tMSSplit.run | 2 +- CEP/CEPFrame/test/CyclicBufferTest.run | 2 +- CEP/CEPFrame/test/Example.run | 2 +- CEP/CEPFrame/test/Simulator_Example.run | 2 +- CEP/CEPFrame/test/TestAutoTrigger.run | 2 +- CEP/CEPFrame/test/Tester.run | 2 +- CEP/tinyCEP/test/Example3.run | 4 ++-- LCS/AMC/AMCImpl/test/tConverter.run | 2 +- LCS/AMC/AMCImpl/test/tConverterStress.run | 2 +- LCS/Transport/test/ExampleEthernet.run | 4 ++-- LCS/Transport/test/ExampleSocketPerf.run | 4 ++-- LCS/Transport/test/tTH_Socket.run | 12 ++++++------ LCS/databases/TransportPL/test/ExamplePL.run | 4 ++-- LCS/databases/TransportPL/test/ExamplePL2.run | 2 +- LCS/databases/TransportPL/test/ExamplePL3.run | 2 +- LCS/databases/TransportPL/test/ExamplePL4.run | 3 +-- LCS/databases/TransportPL/test/TestBidirectional.run | 2 +- LCS/databases/TransportPostgres/test/ExampleDB.run | 2 +- LCS/databases/TransportPostgres/test/ExampleDB2.run | 2 +- Makefile | 2 +- 28 files changed, 42 insertions(+), 43 deletions(-) diff --git a/CEP/BB/BBS3/test/tBBS3.run b/CEP/BB/BBS3/test/tBBS3.run index d623285cc9c..c08dae09de2 100755 --- a/CEP/BB/BBS3/test/tBBS3.run +++ b/CEP/BB/BBS3/test/tBBS3.run @@ -23,5 +23,5 @@ ln -s $cdir/demo.MEP /tmp/test.demo3-1.MEP echo " Preparing BlackBoard ..." time prepareBBD >> test.log echo " Starting solve ..." -time tBBS3 tBBS3.in 3 >& test.out +time $LOFAR_CHECKTOOL tBBS3 tBBS3.in 3 >& test.out diff --git a/CEP/BB/BBS3/test/tCorrect.run b/CEP/BB/BBS3/test/tCorrect.run index 660b6693927..c3aa0d59ea0 100755 --- a/CEP/BB/BBS3/test/tCorrect.run +++ b/CEP/BB/BBS3/test/tCorrect.run @@ -5,7 +5,7 @@ cp -r /data/PSS3/diepen/BBS2/demo3.MS_p1 /tmp/$USER.demo cp -r /data/PSS3/diepen/BBS2/demo3_corr.MEP /tmp/$USER.demo.MEP cp -r /data/PSS3/diepen/BBS2/demo3_gsm.MEP_tPredict /tmp/$USER.demo_gsm.MEP -./tCorrect $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP +$LOFAR_CHECKTOOL ./tCorrect $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP status=$? #\rm -rf /tmp/$USER.demo* exit $status diff --git a/CEP/BB/BBS3/test/tMSData.run b/CEP/BB/BBS3/test/tMSData.run index 592830eb2f2..7dafc63b89a 100755 --- a/CEP/BB/BBS3/test/tMSData.run +++ b/CEP/BB/BBS3/test/tMSData.run @@ -5,12 +5,12 @@ cp -r /data/PSS3/diepen/BBS2/demo3.MEP /tmp/$USER.demo.MEP cp -r /data/PSS3/diepen/BBS2/demo3_gsm.MEP /tmp/$USER.demo_gsm.MEP ln -s /data/PSS3/diepen/BBS2/demo3.MS_p1 /tmp/$USER.demo -./tMSData /data/PSS3/diepen/BBS2/demo3.MS $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP 100 MODEL_DATA +$LOFAR_CHECKTOOL ./tMSData /data/PSS3/diepen/BBS2/demo3.MS $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP 100 MODEL_DATA status=$? \rm -rf /tmp/$USER.demo ln -s /data/PSS3/diepen/BBS2/3C343/10008336.MS_p1 /tmp/$USER.demo -./tMSData /data/PSS3/diepen/BBS2/3C343/10008336.MS $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP 14 DATA +$LOFAR_CHECKTOOL ./tMSData /data/PSS3/diepen/BBS2/3C343/10008336.MS $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP 14 DATA #\rm -rf /tmp/$USER.demo* exit $status diff --git a/CEP/BB/BBS3/test/tPerturbed.run b/CEP/BB/BBS3/test/tPerturbed.run index 9d8ad2fc1c4..991d7a646c8 100755 --- a/CEP/BB/BBS3/test/tPerturbed.run +++ b/CEP/BB/BBS3/test/tPerturbed.run @@ -2,22 +2,22 @@ BASEDIR=/data/PSS3/diepen/BBS2 -./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ.REALIMAG 'RA.*' 'DEC.*' 'StokesI.*' +$LOFAR_CHECKTOOL ./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ.REALIMAG 'RA.*' 'DEC.*' 'StokesI.*' status=$? -./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ 'RA.*' 'DEC.*' 'StokesI.*' +$LOFAR_CHECKTOOL ./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ 'RA.*' 'DEC.*' 'StokesI.*' stat=$? if [ $stat != 0 ]; then status=$stat fi -./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ 'EJ*' +$LOFAR_CHECKTOOL ./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3_gsm.MEP TOTALEJ 'EJ*' stat=$? if [ $stat != 0 ]; then status=$stat fi -./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3p_gsm.MEP TOTALEJ 'RA.*' 'DEC.*' 'StokesI.*' +$LOFAR_CHECKTOOL ./tPerturbed $USER $BASEDIR/demo3.MS_p1 $BASEDIR/demo3.MEP $BASEDIR/demo3p_gsm.MEP TOTALEJ 'RA.*' 'DEC.*' 'StokesI.*' stat=$? if [ $stat != 0 ]; then status=$stat diff --git a/CEP/BB/BBS3/test/tPredSolv.run b/CEP/BB/BBS3/test/tPredSolv.run index 35095b9d9b4..532b9ffdb3c 100755 --- a/CEP/BB/BBS3/test/tPredSolv.run +++ b/CEP/BB/BBS3/test/tPredSolv.run @@ -7,7 +7,7 @@ BASEDIR=/data/PSS3/diepen/BBS2 cp -r $BASEDIR/demo3.MEP /tmp/$USER.demo.MEP cp -r $BASEDIR/demo3_gsm.MEP /tmp/$USER.demo_gsm.MEP -./tPredSolv $USER $BASEDIR/demo3.MS_p1 /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP +$LOFAR_CHECKTOOL ./tPredSolv $USER $BASEDIR/demo3.MS_p1 /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP status=$? #\rm -rf /tmp/$USER.demo* exit $status diff --git a/CEP/BB/BBS3/test/tPredict.run b/CEP/BB/BBS3/test/tPredict.run index ee22cfd8971..4f10f11e053 100755 --- a/CEP/BB/BBS3/test/tPredict.run +++ b/CEP/BB/BBS3/test/tPredict.run @@ -5,7 +5,7 @@ cp -r /data/PSS3/diepen/BBS2/demo3.MS_p1 /tmp/$USER.demo cp -r /data/PSS3/diepen/BBS2/demo3.MEP /tmp/$USER.demo.MEP cp -r /data/PSS3/diepen/BBS2/demo3_gsm.MEP_tPredict /tmp/$USER.demo_gsm.MEP -./tPredict $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP +$LOFAR_CHECKTOOL ./tPredict $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP status=$? #\rm -rf /tmp/$USER.demo* exit $status diff --git a/CEP/BB/BBS3/test/tSubtract.run b/CEP/BB/BBS3/test/tSubtract.run index 2e77b7150fe..8518b9ddf26 100755 --- a/CEP/BB/BBS3/test/tSubtract.run +++ b/CEP/BB/BBS3/test/tSubtract.run @@ -5,7 +5,7 @@ cp -r /data/PSS3/diepen/BBS2/demo3.MS_p1 /tmp/$USER.demo cp -r /data/PSS3/diepen/BBS2/demo3.MEP /tmp/$USER.demo.MEP cp -r /data/PSS3/diepen/BBS2/demo3_gsm.MEP_tPredict /tmp/$USER.demo_gsm.MEP -./tSubtract $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP +$LOFAR_CHECKTOOL ./tSubtract $USER /tmp/$USER.demo /tmp/$USER.demo.MEP /tmp/$USER.demo_gsm.MEP status=$? #\rm -rf /tmp/$USER.demo* exit $status diff --git a/CEP/BB/BDBReplication/test/tBDBReplication.run b/CEP/BB/BDBReplication/test/tBDBReplication.run index 1544c49f22b..75c2d6f0317 100755 --- a/CEP/BB/BDBReplication/test/tBDBReplication.run +++ b/CEP/BB/BDBReplication/test/tBDBReplication.run @@ -5,13 +5,13 @@ MAXRUNTIME=120 rm masterDir -rf mkdir masterDir -./tBDBReplication -h masterDir -o 8020 &> master.log & +$LOFAR_CHECKTOOL ./tBDBReplication -h masterDir -o 8020 &> master.log & MASTERPID=$! echo "master has pid $MASTERPID" >&2 rm slave1Dir -rf mkdir slave1Dir -./tBDBReplication -h slave1Dir -m 8020 -o 8021 &> slave1.log & +$LOFAR_CHECKTOOL ./tBDBReplication -h slave1Dir -m 8020 -o 8021 &> slave1.log & SLAVEPID=$! echo "slave has pid $SLAVEPID" >&2 diff --git a/CEP/BB/MS/test/tMSSplit.run b/CEP/BB/MS/test/tMSSplit.run index 7d51de0829e..01d801a1a96 100755 --- a/CEP/BB/MS/test/tMSSplit.run +++ b/CEP/BB/MS/test/tMSSplit.run @@ -7,4 +7,4 @@ if [ ! -d $1/tMSSplit.MS ]; then fi # Do the split and check it thereafter. ../src/MSSplit $1/tMSSplit.MS tMSSplit_tmp && \ - tMSSplit $1/tMSSplit.MS tMSSplit_tmp + $LOFAR_CHECKTOOL tMSSplit $1/tMSSplit.MS tMSSplit_tmp diff --git a/CEP/CEPFrame/test/CyclicBufferTest.run b/CEP/CEPFrame/test/CyclicBufferTest.run index e739236b3ee..77e15184e7b 100755 --- a/CEP/CEPFrame/test/CyclicBufferTest.run +++ b/CEP/CEPFrame/test/CyclicBufferTest.run @@ -10,6 +10,6 @@ if [ `uname -s | tr '[A-Z]' '[a-z]'` = "linux" ] ; then fi fi -./CyclicBufferTest -dGlobal=0 +$LOFAR_CHECKTOOL ./CyclicBufferTest -dGlobal=0 STATUS=$? exit $STATUS diff --git a/CEP/CEPFrame/test/Example.run b/CEP/CEPFrame/test/Example.run index 76b575796c0..90d5327b6cc 100755 --- a/CEP/CEPFrame/test/Example.run +++ b/CEP/CEPFrame/test/Example.run @@ -1,6 +1,6 @@ #!/bin/sh -./Example -dGlobal=0 +$LOFAR_CHECKTOOL ./Example -dGlobal=0 STATUS=$? if [ $STATUS ] then diff --git a/CEP/CEPFrame/test/Simulator_Example.run b/CEP/CEPFrame/test/Simulator_Example.run index 8e1c36da06b..469e3771af7 100755 --- a/CEP/CEPFrame/test/Simulator_Example.run +++ b/CEP/CEPFrame/test/Simulator_Example.run @@ -1,5 +1,5 @@ #!/bin/sh -./Simulator_Example -dGlobal=0 < Simulator_Example.in +$LOFAR_CHECKTOOL ./Simulator_Example -dGlobal=0 < Simulator_Example.in STATUS=$? exit $STATUS diff --git a/CEP/CEPFrame/test/TestAutoTrigger.run b/CEP/CEPFrame/test/TestAutoTrigger.run index 6a21b0d21ac..e1471a01ffc 100755 --- a/CEP/CEPFrame/test/TestAutoTrigger.run +++ b/CEP/CEPFrame/test/TestAutoTrigger.run @@ -1,5 +1,5 @@ #!/bin/sh -./TestAutoTrigger -dGlobal=1 +$LOFAR_CHECKTOOL ./TestAutoTrigger -dGlobal=1 STATUS=$? exit $STATUS diff --git a/CEP/CEPFrame/test/Tester.run b/CEP/CEPFrame/test/Tester.run index 0c7eae4f60c..671e6d89169 100755 --- a/CEP/CEPFrame/test/Tester.run +++ b/CEP/CEPFrame/test/Tester.run @@ -1,6 +1,6 @@ #!/bin/sh -./Tester -dGlobal=0 +$LOFAR_CHECKTOOL ./Tester -dGlobal=0 STATUS=$? exit $STATUS diff --git a/CEP/tinyCEP/test/Example3.run b/CEP/tinyCEP/test/Example3.run index 3c8ff3142a1..ab3265060dc 100755 --- a/CEP/tinyCEP/test/Example3.run +++ b/CEP/tinyCEP/test/Example3.run @@ -3,8 +3,8 @@ # Run the Example3 test program by starting it twice. # Once as sender and once as receiver. -./Example3 -s > Example3_tmp.outs & -./Example3 -r > Example3_tmp.outr +$LOFAR_CHECKTOOL ./Example3 -s > Example3_tmp.outs & +$LOFAR_CHECKTOOL ./Example3 -r > Example3_tmp.outr # If something went wrong, kill the background process (if it's still running) # and exit. diff --git a/LCS/AMC/AMCImpl/test/tConverter.run b/LCS/AMC/AMCImpl/test/tConverter.run index 89fcc9cd1cb..f87ba819f54 100755 --- a/LCS/AMC/AMCImpl/test/tConverter.run +++ b/LCS/AMC/AMCImpl/test/tConverter.run @@ -56,7 +56,7 @@ then fi # Start the test program. -$EXEC ./tConverter +$EXEC $LOFAR_CHECKTOOL ./tConverter STATUS=$? # If something went wrong, secure the log file(s) diff --git a/LCS/AMC/AMCImpl/test/tConverterStress.run b/LCS/AMC/AMCImpl/test/tConverterStress.run index 9146eae8bfa..0fbfda97fad 100755 --- a/LCS/AMC/AMCImpl/test/tConverterStress.run +++ b/LCS/AMC/AMCImpl/test/tConverterStress.run @@ -58,7 +58,7 @@ then fi # Start the test program. -$EXEC ./tConverterStress +$EXEC $LOFAR_CHECKTOOL ./tConverterStress STATUS=$? # If something went wrong, secure the log file(s) diff --git a/LCS/Transport/test/ExampleEthernet.run b/LCS/Transport/test/ExampleEthernet.run index 366c899061d..fa5dc61b098 100755 --- a/LCS/Transport/test/ExampleEthernet.run +++ b/LCS/Transport/test/ExampleEthernet.run @@ -7,9 +7,9 @@ if [ $HOSTNAME != "lofar17" ]; then echo "ExampleEthernet test must run on lofar17!" exit 1 else - (./ExampleEthernet -r eth0 00:30:48:12:47:D8 >ExampleEthernet_tmp.outr; echo $? >>ExampleEthernet_tmp.result)& + ($LOFAR_CHECKTOOL ./ExampleEthernet -r eth0 00:30:48:12:47:D8 >ExampleEthernet_tmp.outr; echo $? >>ExampleEthernet_tmp.result)& sleep 1 - ./ExampleEthernet -s eth0 00:30:48:12:47:D8 >ExampleEthernet_tmp.outs; echo $? >>ExampleEthernet_tmp.result + $LOFAR_CHECKTOOL ./ExampleEthernet -s eth0 00:30:48:12:47:D8 >ExampleEthernet_tmp.outs; echo $? >>ExampleEthernet_tmp.result grep "1" ExampleEthernet_tmp.result if [ $? -ne 1 ]; then diff --git a/LCS/Transport/test/ExampleSocketPerf.run b/LCS/Transport/test/ExampleSocketPerf.run index 46f436d7aa6..aab60f6c521 100755 --- a/LCS/Transport/test/ExampleSocketPerf.run +++ b/LCS/Transport/test/ExampleSocketPerf.run @@ -3,7 +3,7 @@ # Run the ExampleSocketPerf test program by starting it twice. # Once as server and once as client. -./ExampleSocketPerf -s -Server > ExampleSocketPerf_tmp.outs1 & -./ExampleSocketPerf -r -Client > ExampleSocketPerf_tmp.outc1 +$LOFAR_CHECKTOOL ./ExampleSocketPerf -s -Server > ExampleSocketPerf_tmp.outs1 & +$LOFAR_CHECKTOOL ./ExampleSocketPerf -r -Client > ExampleSocketPerf_tmp.outc1 sleep 1 cat ExampleSocketPerf_tmp.outs1 ExampleSocketPerf_tmp.outc1 diff --git a/LCS/Transport/test/tTH_Socket.run b/LCS/Transport/test/tTH_Socket.run index b1a8c9c093f..d267959957f 100755 --- a/LCS/Transport/test/tTH_Socket.run +++ b/LCS/Transport/test/tTH_Socket.run @@ -3,11 +3,11 @@ # Run the ExampleSocket test program by starting it twice. # Once as server and once as client. -echo "Run1 (takes about 30 seconds) ..." +echo "Run1 (takes about 30 seconds, longer if checktool is used) ..." rm -f tTH_Socket_tmp.result -(./tTH_Socket -s 1>tTH_Socket_tmp.outs1 2>&1 ; echo $? >>tTH_Socket_tmp.result )& +($LOFAR_CHECKTOOL ./tTH_Socket -s 1>tTH_Socket_tmp.outs1 2>&1 ; echo $? >>tTH_Socket_tmp.result )& echo "CLIENT OUTPUT" - ./tTH_Socket -c ; echo $? >>tTH_Socket_tmp.result + $LOFAR_CHECKTOOL ./tTH_Socket -c ; echo $? >>tTH_Socket_tmp.result sleep 1 echo "SERVER OUTPUT" cat tTH_Socket_tmp.outs1 @@ -18,11 +18,11 @@ if [ $? -ne 1 ]; then fi # Do another run with starting the client before the server. -echo "Run2 (takes about 30 seconds) ..." +echo "Run2 (takes about 30 seconds, longer if checktool is used) ..." rm -f tTH_Socket_tmp.result -(./tTH_Socket -c 1>tTH_Socket_tmp.outc2 2>&1 ; echo $? >>tTH_Socket_tmp.result )& +($LOFAR_CHECKTOOL ./tTH_Socket -c 1>tTH_Socket_tmp.outc2 2>&1 ; echo $? >>tTH_Socket_tmp.result )& echo "SERVER OUTPUT" - ./tTH_Socket -s ; echo $? >>tTH_Socket_tmp.result + $LOFAR_CHECKTOOL ./tTH_Socket -s ; echo $? >>tTH_Socket_tmp.result sleep 1 echo "CLIENT OUTPUT" cat tTH_Socket_tmp.outc2 diff --git a/LCS/databases/TransportPL/test/ExamplePL.run b/LCS/databases/TransportPL/test/ExamplePL.run index 3e8f09db365..736b510adfe 100755 --- a/LCS/databases/TransportPL/test/ExamplePL.run +++ b/LCS/databases/TransportPL/test/ExamplePL.run @@ -16,7 +16,7 @@ _EOF_ if [ "$1" != "" ]; then exit 0; fi -./ExamplePL +$LOFAR_CHECKTOOL ./ExamplePL STATUS=$? if [ $STATUS != 0 ]; then exit $STATUS @@ -28,4 +28,4 @@ psql -h dop50.astron.nl -U postgres test << _EOF_ > ExamplePL_tmp.psql_out 2>&1 \q _EOF_ -./ExamplePL 2 +$LOFAR_CHECKTOOL ./ExamplePL 2 diff --git a/LCS/databases/TransportPL/test/ExamplePL2.run b/LCS/databases/TransportPL/test/ExamplePL2.run index c17562f97d0..5928f35194c 100755 --- a/LCS/databases/TransportPL/test/ExamplePL2.run +++ b/LCS/databases/TransportPL/test/ExamplePL2.run @@ -14,7 +14,7 @@ _EOF_ # Run the test program if no first argument is given. if [ "$1" = "" ]; then - ./ExamplePL2 + $LOFAR_CHECKTOOL ./ExamplePL2 STATUS=$? if [ $STATUS != 0 ]; then exit $STATUS diff --git a/LCS/databases/TransportPL/test/ExamplePL3.run b/LCS/databases/TransportPL/test/ExamplePL3.run index 0f640804df5..34d2fe326e5 100755 --- a/LCS/databases/TransportPL/test/ExamplePL3.run +++ b/LCS/databases/TransportPL/test/ExamplePL3.run @@ -14,7 +14,7 @@ _EOF_ # Run the test program if no first argument is given. if [ "$1" = "" ]; then - ./ExamplePL3 +$LOFAR_CHECKTOOL ./ExamplePL3 STATUS=$? if [ $STATUS != 0 ]; then exit $STATUS diff --git a/LCS/databases/TransportPL/test/ExamplePL4.run b/LCS/databases/TransportPL/test/ExamplePL4.run index 07751d80b3c..c92f31465d4 100755 --- a/LCS/databases/TransportPL/test/ExamplePL4.run +++ b/LCS/databases/TransportPL/test/ExamplePL4.run @@ -14,8 +14,7 @@ _EOF_ # Run the test program if no first argument is given. if [ "$1" = "" ]; then -# ~/bin/valgrind --tool=memcheck --num-callers=50 --workaround-gcc296-bugs=yes --leak-check=yes --track-fds=yes ./ExamplePL4 - ./ExamplePL4 + $LOFAR_CHECKTOOL ./ExamplePL4 STATUS=$? if [ $STATUS != 0 ]; then exit $STATUS diff --git a/LCS/databases/TransportPL/test/TestBidirectional.run b/LCS/databases/TransportPL/test/TestBidirectional.run index abc10ed2cd1..4415c29fad4 100755 --- a/LCS/databases/TransportPL/test/TestBidirectional.run +++ b/LCS/databases/TransportPL/test/TestBidirectional.run @@ -16,7 +16,7 @@ _EOF_ if [ "$1" != "" ]; then exit 0; fi -./TestBidirectional +$LOFAR_CHECKTOOL ./TestBidirectional STATUS=$? if [ $STATUS != 0 ]; then exit $STATUS diff --git a/LCS/databases/TransportPostgres/test/ExampleDB.run b/LCS/databases/TransportPostgres/test/ExampleDB.run index 00c285b2d72..f651eaa9ad6 100755 --- a/LCS/databases/TransportPostgres/test/ExampleDB.run +++ b/LCS/databases/TransportPostgres/test/ExampleDB.run @@ -14,7 +14,7 @@ _EOF_ # Run the test program if no first argument is given. if [ "$1" = "" ]; then - ./ExampleDB + $LOFAR_CHECKTOOL ./ExampleDB STATUS=$? if [ $STATUS != 0 ]; then exit $STATUS diff --git a/LCS/databases/TransportPostgres/test/ExampleDB2.run b/LCS/databases/TransportPostgres/test/ExampleDB2.run index b4bddc44d3f..48f40cd8cfc 100755 --- a/LCS/databases/TransportPostgres/test/ExampleDB2.run +++ b/LCS/databases/TransportPostgres/test/ExampleDB2.run @@ -14,7 +14,7 @@ _EOF_ # Run the test program if no first argument is given. if [ "$1" = "" ]; then - ./ExampleDB2 + $LOFAR_CHECKTOOL ./ExampleDB2 STATUS=$? if [ $STATUS != 0 ]; then exit $STATUS diff --git a/Makefile b/Makefile index 93fde6b7b6d..d71e56ff914 100644 --- a/Makefile +++ b/Makefile @@ -352,7 +352,7 @@ configure: $(VARIANTNAMES:.variant=.variant_configure) # Rules for building documentation using doxygen or doc++. # Default output directory is docxxhtml. ifeq "$(DOCDIR)" "" - export DOCDIR := /data/LOFAR/installed/docxxhtml + export DOCDIR := /data/LOFAR/installed/weekly/docxxhtml endif ifeq "$(DOXYGEN)" "" -- GitLab