diff --git a/examples/runTimeDepTest.sh b/examples/runTimeDepTest.sh index 91c56d7..cefb278 100755 --- a/examples/runTimeDepTest.sh +++ b/examples/runTimeDepTest.sh @@ -1,62 +1,73 @@ #!/bin/bash #!/bin/bash # Copyright 2020 University of Warwick # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. # Laura++ package authors: # John Back # Paul Harrison # Thomas Latham # Number of experiments to fit, number of the first experiment, number of tasks to run, fit id, number of experiments generated if [ $# -lt 5 ] then echo "Usage: $0 " exit 1 fi nexpt=$1 firstexpt=$2 numtasks=$3 i=$4 nExptGen=$5 if [ $numtasks -lt 2 ] then echo "Number of task must be at least 2" exit 1 fi echo " $# --- nexpt $nexpt firstexpt $firstexpt numtasks $numtasks i $i nexptgen $nExptGen" echo "Running fit $i" -SimFitCoordinator $i $nexpt $firstexpt $numtasks > coordinator-log-$i.out 2>&1 & +SimFitCoordinator $i $nexpt $firstexpt $numtasks > coordinator-$i.log 2>&1 & echo "Initialised coordinator process for fit $i" sleep 10 -port=`tail -1 coordinator-log-${i}.out | awk '{print $NF}'` +port=`tail -1 coordinator-${i}.log | awk '{print $NF}'` echo "Coordinator is listening on port $port" echo "Initialising tasks..." sleep 1 Test_Dpipi fit CPEven $port $i $firstexpt $nexpt $nExptGen --hist > task-CPEven-perevt-${i}.log 2>&1 & sleep 1 Test_Dpipi fit QFS $port $i $firstexpt $nexpt $nExptGen --hist > task-QFS-perevt-${i}.log 2>&1 echo "Fit completed" + +echo "Warnings/Errors from coordinator:" +grep -e ERROR -e WARNING -e Error -e Warning coordinator-$i.log + +echo "Warnings/Errors from CPeven task:" +grep -e ERROR -e WARNING -e Error -e Warning task-CPEven-perevt-$i.log + +echo "Warnings/Errors from QFS task:" +grep -e ERROR -e WARNING -e Error -e Warning task-QFS-perevt-$i.log + +echo "Tests against reference gen/fit output to be implemented here"