aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Williams <neil.williams@linaro.org>2018-06-05 10:15:43 +0100
committerNeil Williams <neil.williams@linaro.org>2018-06-05 10:15:43 +0100
commitd55c3800a976638b5ead6c0852662c5e0dff948b (patch)
tree43ae62d8a459a312f4c40fd7a2a644da598d5deb
parent0d72e3bde2c133a27837ee29f0efdcb36ad12f53 (diff)
fix ups
Change-Id: Ic04eb7e715d69d57c7e3da0f84325767507328f1
-rw-r--r--functional/dispatcher-unit-tests-stretch.yaml2
-rwxr-xr-xtestdefs/probe_device10
2 files changed, 10 insertions, 2 deletions
diff --git a/functional/dispatcher-unit-tests-stretch.yaml b/functional/dispatcher-unit-tests-stretch.yaml
index e8e38c3..601301f 100644
--- a/functional/dispatcher-unit-tests-stretch.yaml
+++ b/functional/dispatcher-unit-tests-stretch.yaml
@@ -15,4 +15,4 @@ metadata:
run:
steps:
- ./testdefs/dispatcher-unittest-run.sh
+ - ./testdefs/dispatcher-unittest-run.sh
diff --git a/testdefs/probe_device b/testdefs/probe_device
index d76a066..24bd354 100755
--- a/testdefs/probe_device
+++ b/testdefs/probe_device
@@ -9,7 +9,15 @@ CONF=$1
ls -alR /dev/
-. ./lava-common
+LAVA='echo # '
+if [ -n `which lava-test-case || true` ]; then
+ LAVA='lava-test-case'
+fi
+
+LAVA_RAISE='echo # '
+if [ -n `which lava-test-raise || true` ]; then
+ LAVA_RAISE='lava-test-raise'
+fi
DEVICE=$(ls -1 /dev/serial/by-id/usb-NXP_SEMICOND_ARM_Energy_Probe* | head -1)
if [ "$DEVICE"x = ""x ] ; then