Skip to content

Commit 560c8f0

Browse files
committed
cleanup
1 parent 9df5cac commit 560c8f0

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

validation/advanced-tests/run-advanced-tests.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,34 @@
33
# coatjava must already be built at ../../coatjava/
44

55
# set up environment
6+
JAVA_OPTS="-Djava.util.logging.config.file=$PWD/../../etc/logging/debug.properties"
67
CLARA_HOME=$PWD/clara_installation/ ; export CLARA_HOME
78
COAT=$CLARA_HOME/plugins/clas12/
89
classPath="$COAT/lib/services/*:$COAT/lib/clas/*:$COAT/lib/utils/*:../lib/*:src/"
910

1011
# install clara
1112
../../install-clara -c ../../coatjava $CLARA_HOME
12-
if [ $? != 0 ] ; then echo "clara installation error" ; exit 1 ; fi
13+
[ $? -ne 0 ] && echo "clara installation error" && exit 1
1314

1415
# download test files
1516
wget --no-check-certificate http://clasweb.jlab.org/clas12offline/distribution/coatjava/validation_files/twoTrackEvents_809_raw.evio.tar.gz
16-
17-
if [ $? != 0 ] ; then echo "wget validation files failure" ; exit 1 ; fi
17+
[ $? -ne 0 ] && echo "wget validation files failure" && exit 2
1818
tar -zxvf twoTrackEvents_809_raw.evio.tar.gz
1919

20-
export JAVA_OPTS="-Djava.util.logging.config.file=$PWD/../../etc/logging/debug.properties"
21-
2220
# run decoder
2321
$COAT/bin/decoder -t -0.5 -s 0.0 -i ./twoTrackEvents_809_raw.evio -o ./twoTrackEvents_809.hipo -c 2
22+
[ $? -ne 0 ] && echo "decoder failure" && exit 3
2423

2524
# run clara
26-
$COAT/bin/run-clara $COAT/etc/services/kpp.yaml || echo "reconstruction with clara failure" && exit 1
25+
$COAT/bin/run-clara $COAT/etc/services/kpp.yaml
26+
[ $? -ne 0 ] && echo "reconstruction with clara failure" && exit 4
2727

2828
# compile test codes
2929
javac -cp $classPath src/kpptracking/KppTrackingTest.java
30-
if [ $? != 0 ] ; then echo "KppTrackingTest compilation failure" ; exit 1 ; fi
30+
[ $? -ne 0 ] && echo "KppTrackingTest compilation failure" && exit 5
3131

3232
# run KppTracking junit tests
3333
java -DCLAS12DIR="$COAT" -Xmx1536m -Xms1024m -cp $classPath org.junit.runner.JUnitCore kpptracking.KppTrackingTest
34-
if [ $? != 0 ] ; then echo "KppTracking unit test failure" ; exit 1 ; else echo "KppTracking passed unit tests" ; fi
34+
[ $? -ne 0 ] && echo "KppTracking unit test failure" && exit 6
35+
36+
echo "KppTracking passed unit tests"

0 commit comments

Comments
 (0)