From 90adb885794ad8ddafaa25279f61663297508e71 Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Mon, 25 Sep 2023 14:18:08 +0100 Subject: [PATCH] remove Verify.sh system test files --- tests/Verify.adsimdetector.sh | 36 ----------------------------------- tests/Verify.asyn.sh | 3 --- tests/Verify.busy.sh | 3 --- tests/_test_support_build.sh | 15 +-------------- 4 files changed, 1 insertion(+), 56 deletions(-) delete mode 100755 tests/Verify.adsimdetector.sh delete mode 100755 tests/Verify.asyn.sh delete mode 100755 tests/Verify.busy.sh diff --git a/tests/Verify.adsimdetector.sh b/tests/Verify.adsimdetector.sh deleted file mode 100755 index 9158e60..0000000 --- a/tests/Verify.adsimdetector.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -set -xe - -tmpdir=$(mktemp -d) - -# TODO - we should really be sending ibek IOC YAML here instead of -# a hand coded startup script - baby steps ... -echo ' -cd "$(TOP)" - -dbLoadDatabase "dbd/ioc.dbd" -ioc_registerRecordDeviceDriver(pdbbase) -simDetectorConfig("TEST.CAM", 2560, 2160, 1, 50, 0) - -dbLoadRecords (simDetector.template, "P=TEST, R=:CAM:, PORT=TEST.CAM, TIMEOUT=1, ADDR=0") - -iocInit -' > ${tmpdir}/st.cmd - -$docker cp ${tmpdir}/st.cmd test_me:/epics/ioc/config/st.cmd -$docker exec -dit test_me bash -c "cd /epics/ioc; ./start.sh" - -# verify that the IOC is running -$docker exec test_me caget TEST:CAM:Acquire -# now try and run the simdetector and verify that it delivers some frames -$docker exec test_me caput TEST:CAM:Acquire 1 - -first=$($docker exec test_me caget TEST:CAM:ArrayCounter_RBV) -second=$($docker exec test_me caget TEST:CAM:ArrayCounter_RBV) -if [[ $first == 0 || $first == $second ]] ; then - echo "ERROR: simdetector did not deliver any frames" - exit 1 -fi - - diff --git a/tests/Verify.asyn.sh b/tests/Verify.asyn.sh deleted file mode 100755 index 92d2dda..0000000 --- a/tests/Verify.asyn.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# TODO add tests for asyn here see adsimdetector example \ No newline at end of file diff --git a/tests/Verify.busy.sh b/tests/Verify.busy.sh deleted file mode 100755 index 92d2dda..0000000 --- a/tests/Verify.busy.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# TODO add tests for asyn here see adsimdetector example \ No newline at end of file diff --git a/tests/_test_support_build.sh b/tests/_test_support_build.sh index b11a204..a0fadd6 100755 --- a/tests/_test_support_build.sh +++ b/tests/_test_support_build.sh @@ -8,7 +8,7 @@ # # INPUTS: # CACHE: Where to put buildx cache for build cache between CI runs -# ARCH: Target architecture linux or rtems currently +# ARCH: Target architecture linux or rtems currently # PLATFORM: the platform to build for (linux/amd64 or linux/arm64) set -xe @@ -102,19 +102,6 @@ for dockerfile in ${DOCKERFILES}; do # The above check is sufficient to show that the generic IOC will load and # run and that all the necessary runtime libraries are in place. - # - # for more detailed testing add a Verify.xxx.sh script where xxx is the - # the same as the suffix on the Dockerfile. See Verify.asyn for an example. - VERIFY=Verify."${dockerfile#*.}" - if [[ -f ${THIS_FOLDER}/${VERIFY} ]] ; then - $THIS_FOLDER/${VERIFY} test_me - fi - - $docker stop -t0 test_me - if [[ $retry == 10 ]] ; then - echo "ERROR: IOC for ${dockerfile} did not start" - exit 1 - fi done