diff --git a/testing/check b/testing/check index f444562702e0cb4976ec54004a035e49d7debefc..2dac6ea33f3d42ff2eb743c04a45da9ad419f6ef 100755 --- a/testing/check +++ b/testing/check @@ -1 +1 @@ -[ "$1" = "$2" ] && echo "Pass" || echo "***Fail: result = $2***" +[ "$1" = "$2" ] && echo "Pass" || echo "***Fail on test '$3': result = $2***" 1>&2 diff --git a/testing/set_att b/testing/set_att index 7437de03d81efacff69d3b59877a958a1e39deb6..a00dd91b530c15e766d067c1c9876e806177a57b 100755 --- a/testing/set_att +++ b/testing/set_att @@ -31,4 +31,4 @@ result="$(sis8300drv_reg /dev/sis8300-$slot $reg)" rshift=$(( $channel % 4 * 8)) result=$(( ($result >> $rshift) & 0x000000FF)) usleep 500000 -run "check $state $result" +run "check $state $result 'Test attenuator on channel $channel'" diff --git a/testing/state_change b/testing/state_change index c97dc7a1d5adb325336442cad8fa1dc068e3fd53..47a89007f43de730e6ca8b38e029606ebc8f2b44 100755 --- a/testing/state_change +++ b/testing/state_change @@ -13,7 +13,7 @@ eval "caput -S $LLRF_IOC_NAME:MSGS $1 >/dev/null" usleep 500000 result=$(caget -t $LLRF_IOC_NAME) if [ $# -eq 1 ]; then - run "check $1 $result" + run "check $1 $result 'Test state change to $1'" else - run "check $2 $result" + run "check $2 $result 'Test state change to $1'" fi diff --git a/testing/test1.sh b/testing/test1.sh index fa5e9783f9821eeaacc6231bf7661e1a7e6d6684..7f7a616ec64e344ab977961628d6973d1165fda5 100755 --- a/testing/test1.sh +++ b/testing/test1.sh @@ -34,11 +34,11 @@ run "state_change INIT" echo "*** VM Output" echo 'Enable VM' caput $LLRF_IOC_NAME:VMENBL 1 > /dev/null -run "check 0x700 $(sis8300drv_reg /dev/sis8300-$slot 0x12F)" +run "check 0x700 $(sis8300drv_reg /dev/sis8300-$slot 0x12F) 'Test on Enable VM'" echo 'Disable VM' caput $LLRF_IOC_NAME:VMENBL 0 > /dev/null -run "check 0x600 $(sis8300drv_reg /dev/sis8300-$slot 0x12F)" +run "check 0x600 $(sis8300drv_reg /dev/sis8300-$slot 0x12F) 'Test on Disable VM'" echo '*** Attenuation Parameters' echo 'Test in INIT state' @@ -88,7 +88,7 @@ do done result="$(caget -t $LLRF_IOC_NAME:PULSEDONECNT)" -run "check $result 50" +run "check $result 50 'Test simulating backplane triggers'" echo 'Revert to INIT state' run "state_change 'RESET' 'RESETTING'"