<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">generic improvements for the testsbed<br><br>* fix run-tests so it can return != 0<br>* bail out if prepare fails<br>* add more sanity checks to prepare<br>* generalize usb-ids, paths<br>* add test for flashing from application mode<br>* add test reading simcards via pysim<br><br>Change-Id: I246224e29e5936b4fe40cf7d7a5ff83c9940d121<br>---<br>M tests/run-tests<br>M tests/sysmo-octsim/01_check_rig.sh<br>M tests/sysmo-octsim/02_flash_dfu.sh<br>M tests/sysmo-octsim/03_check_lsusb.sh<br>M tests/sysmo-octsim/04_check_dfu_lsusb.sh<br>A tests/sysmo-octsim/05_flash_dfu_from_app.out<br>A tests/sysmo-octsim/05_flash_dfu_from_app.sh<br>A tests/sysmo-octsim/06_test_simcards.out<br>A tests/sysmo-octsim/06_test_simcards.sh<br>M tests/sysmo-octsim/README<br>A tests/sysmo-octsim/ctl_get_relay_sn.sh<br>M tests/sysmo-octsim/ctl_reset_target.sh<br>M tests/sysmo-octsim/ctl_reset_to_dfu.sh<br>M tests/sysmo-octsim/fetch_image.sh<br>M tests/sysmo-octsim/flash_octsim_dfu.sh<br>M tests/sysmo-octsim/get_installed_version.sh<br>M tests/sysmo-octsim/prepare<br>M tests/sysmo-octsim/regen<br>M tests/sysmo-octsim/run-tests<br>M tests/sysmo-octsim/test-data<br>20 files changed, 214 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/run-tests b/tests/run-tests</span><br><span>index bfc942d..0132010 100755</span><br><span>--- a/tests/run-tests</span><br><span>+++ b/tests/run-tests</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span> echo "=========================================================="</span><br><span> echo " EXECUTING TESTS FOR SYSMO-OCTSIM"</span><br><span> echo "=========================================================="</span><br><span>diff --git a/tests/sysmo-octsim/01_check_rig.sh b/tests/sysmo-octsim/01_check_rig.sh</span><br><span>index 3831fb6..11abdc8 100755</span><br><span>--- a/tests/sysmo-octsim/01_check_rig.sh</span><br><span>+++ b/tests/sysmo-octsim/01_check_rig.sh</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span> . ./test-data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-lsusb -d 04d8:ffee -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g"</span><br><span style="color: hsl(120, 100%, 40%);">+lsusb -d $USBD_RELAY -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g"</span><br><span>diff --git a/tests/sysmo-octsim/02_flash_dfu.sh b/tests/sysmo-octsim/02_flash_dfu.sh</span><br><span>index c51d5b1..a9b6573 100755</span><br><span>--- a/tests/sysmo-octsim/02_flash_dfu.sh</span><br><span>+++ b/tests/sysmo-octsim/02_flash_dfu.sh</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span> . ./test-data</span><br><span> </span><br><span> ./get_installed_version.sh</span><br><span>diff --git a/tests/sysmo-octsim/03_check_lsusb.sh b/tests/sysmo-octsim/03_check_lsusb.sh</span><br><span>index f12e7d4..cf8d8f4 100755</span><br><span>--- a/tests/sysmo-octsim/03_check_lsusb.sh</span><br><span>+++ b/tests/sysmo-octsim/03_check_lsusb.sh</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span> . ./test-data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-lsusb -d 1d50:6141 -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g"|sed -e "s/^.*iProduct.*2.*sysmoOCTSIM.*$/ iProduct 2 sysmoOCTSIM/g"</span><br><span style="color: hsl(120, 100%, 40%);">+lsusb -d $USBD_TARGET -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g"|sed -e "s/^.*iProduct.*2.*sysmoOCTSIM.*$/ iProduct 2 sysmoOCTSIM/g"</span><br><span>diff --git a/tests/sysmo-octsim/04_check_dfu_lsusb.sh b/tests/sysmo-octsim/04_check_dfu_lsusb.sh</span><br><span>index eef2246..fda72c4 100755</span><br><span>--- a/tests/sysmo-octsim/04_check_dfu_lsusb.sh</span><br><span>+++ b/tests/sysmo-octsim/04_check_dfu_lsusb.sh</span><br><span>@@ -1,6 +1,6 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span> . ./test-data</span><br><span> </span><br><span> ./ctl_reset_to_dfu.sh</span><br><span style="color: hsl(0, 100%, 40%);">-lsusb -d 1d50:6141 -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g"</span><br><span style="color: hsl(120, 100%, 40%);">+lsusb -d $USBD_TARGET -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g"</span><br><span> ./ctl_reset_target.sh</span><br><span>diff --git a/tests/sysmo-octsim/05_flash_dfu_from_app.out b/tests/sysmo-octsim/05_flash_dfu_from_app.out</span><br><span>new file mode 100644</span><br><span>index 0000000..3da656a</span><br><span>--- /dev/null</span><br><span>+++ b/tests/sysmo-octsim/05_flash_dfu_from_app.out</span><br><span>@@ -0,0 +1,26 @@</span><br><span style="color: hsl(120, 100%, 40%);">+resetting target</span><br><span style="color: hsl(120, 100%, 40%);">+done</span><br><span style="color: hsl(120, 100%, 40%);">+dfu-util 0.9</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc.</span><br><span style="color: hsl(120, 100%, 40%);">+Copyright 2010-2016 Tormod Volden and Stefan Schmidt</span><br><span style="color: hsl(120, 100%, 40%);">+This program is Free Software and has ABSOLUTELY NO WARRANTY</span><br><span style="color: hsl(120, 100%, 40%);">+Please report bugs to http://sourceforge.net/p/dfu-util/tickets/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Opening DFU capable USB device...</span><br><span style="color: hsl(120, 100%, 40%);">+ID 1d50:6141</span><br><span style="color: hsl(120, 100%, 40%);">+Run-time device DFU version 0100</span><br><span style="color: hsl(120, 100%, 40%);">+Claiming USB DFU Runtime Interface...</span><br><span style="color: hsl(120, 100%, 40%);">+Determining device status: state = appIDLE, status = 0</span><br><span style="color: hsl(120, 100%, 40%);">+Device really in Runtime Mode, send DFU detach request...</span><br><span style="color: hsl(120, 100%, 40%);">+Device will detach and reattach...</span><br><span style="color: hsl(120, 100%, 40%);">+Opening DFU USB Device...</span><br><span style="color: hsl(120, 100%, 40%);">+Claiming USB DFU Interface...</span><br><span style="color: hsl(120, 100%, 40%);">+Setting Alternate Setting #0 ...</span><br><span style="color: hsl(120, 100%, 40%);">+Determining device status: state = dfuIDLE, status = 0</span><br><span style="color: hsl(120, 100%, 40%);">+dfuIDLE, continuing</span><br><span style="color: hsl(120, 100%, 40%);">+DFU mode device DFU version 0110</span><br><span style="color: hsl(120, 100%, 40%);">+Device returned transfer size 512</span><br><span style="color: hsl(120, 100%, 40%);">+Copying data from PC to DFU device</span><br><span style="color: hsl(120, 100%, 40%);">+Download done.</span><br><span style="color: hsl(120, 100%, 40%);">+Resetting USB to switch back to runtime mode</span><br><span>diff --git a/tests/sysmo-octsim/05_flash_dfu_from_app.sh b/tests/sysmo-octsim/05_flash_dfu_from_app.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..667ca44</span><br><span>--- /dev/null</span><br><span>+++ b/tests/sysmo-octsim/05_flash_dfu_from_app.sh</span><br><span>@@ -0,0 +1,9 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span style="color: hsl(120, 100%, 40%);">+. ./test-data</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+./get_installed_version.sh</span><br><span style="color: hsl(120, 100%, 40%);">+#./fetch_image.sh</span><br><span style="color: hsl(120, 100%, 40%);">+./ctl_reset_target.sh</span><br><span style="color: hsl(120, 100%, 40%);">+./flash_octsim_dfu.sh</span><br><span style="color: hsl(120, 100%, 40%);">+sleep 1</span><br><span style="color: hsl(120, 100%, 40%);">+./get_installed_version.sh</span><br><span>diff --git a/tests/sysmo-octsim/06_test_simcards.out b/tests/sysmo-octsim/06_test_simcards.out</span><br><span>new file mode 100644</span><br><span>index 0000000..addd462</span><br><span>--- /dev/null</span><br><span>+++ b/tests/sysmo-octsim/06_test_simcards.out</span><br><span>@@ -0,0 +1,117 @@</span><br><span style="color: hsl(120, 100%, 40%);">+resetting target</span><br><span style="color: hsl(120, 100%, 40%);">+done</span><br><span style="color: hsl(120, 100%, 40%);">+card slot 0</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=0) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Reading ...</span><br><span style="color: hsl(120, 100%, 40%);">+ICCID: 8988211000000090160</span><br><span style="color: hsl(120, 100%, 40%);">+IMSI: 001640000069444</span><br><span style="color: hsl(120, 100%, 40%);">+SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000</span><br><span style="color: hsl(120, 100%, 40%);">+SPN: Not available</span><br><span style="color: hsl(120, 100%, 40%);">+Display HPLMN: False</span><br><span style="color: hsl(120, 100%, 40%);">+Display OPLMN: False</span><br><span style="color: hsl(120, 100%, 40%);">+PLMNsel: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span style="color: hsl(120, 100%, 40%);">+PLMNwAcT:</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OPLMNwAcT:</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+HPLMNAcT:</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ACC: 0040</span><br><span style="color: hsl(120, 100%, 40%);">+MSISDN: Can't read file -- Length of MSISDN (136 bytes) is out of range</span><br><span style="color: hsl(120, 100%, 40%);">+AD: 00000002</span><br><span style="color: hsl(120, 100%, 40%);">+Done !</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+card slot 4</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=4) interface</span><br><span style="color: hsl(120, 100%, 40%);">+Reading ...</span><br><span style="color: hsl(120, 100%, 40%);">+ICCID: 8988211000000271083</span><br><span style="color: hsl(120, 100%, 40%);">+IMSI: 001640000069555</span><br><span style="color: hsl(120, 100%, 40%);">+SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000</span><br><span style="color: hsl(120, 100%, 40%);">+SPN: Not available</span><br><span style="color: hsl(120, 100%, 40%);">+Display HPLMN: False</span><br><span style="color: hsl(120, 100%, 40%);">+Display OPLMN: False</span><br><span style="color: hsl(120, 100%, 40%);">+PLMNsel: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff</span><br><span style="color: hsl(120, 100%, 40%);">+PLMNwAcT:</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OPLMNwAcT:</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+HPLMNAcT:</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+ ffffffffff # unused</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ACC: 0100</span><br><span style="color: hsl(120, 100%, 40%);">+MSISDN: Not available</span><br><span style="color: hsl(120, 100%, 40%);">+AD: 00000002</span><br><span style="color: hsl(120, 100%, 40%);">+Done !</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/sysmo-octsim/06_test_simcards.sh b/tests/sysmo-octsim/06_test_simcards.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..bd50aa8</span><br><span>--- /dev/null</span><br><span>+++ b/tests/sysmo-octsim/06_test_simcards.sh</span><br><span>@@ -0,0 +1,13 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span style="color: hsl(120, 100%, 40%);">+. ./test-data</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+./ctl_reset_target.sh</span><br><span style="color: hsl(120, 100%, 40%);">+sleep 1</span><br><span style="color: hsl(120, 100%, 40%);">+./get_installed_version.sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo "card slot 0"</span><br><span style="color: hsl(120, 100%, 40%);">+$PYSIMREAD -p 0</span><br><span style="color: hsl(120, 100%, 40%);">+echo ""</span><br><span style="color: hsl(120, 100%, 40%);">+echo "card slot 4"</span><br><span style="color: hsl(120, 100%, 40%);">+$PYSIMREAD -p 4</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/tests/sysmo-octsim/README b/tests/sysmo-octsim/README</span><br><span>index b3ac561..162b876 100644</span><br><span>--- a/tests/sysmo-octsim/README</span><br><span>+++ b/tests/sysmo-octsim/README</span><br><span>@@ -2,3 +2,4 @@</span><br><span> - lsusb</span><br><span> - dfu-util</span><br><span> - wget</span><br><span style="color: hsl(120, 100%, 40%);">+- pysim</span><br><span>diff --git a/tests/sysmo-octsim/ctl_get_relay_sn.sh b/tests/sysmo-octsim/ctl_get_relay_sn.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..3566cf9</span><br><span>--- /dev/null</span><br><span>+++ b/tests/sysmo-octsim/ctl_get_relay_sn.sh</span><br><span>@@ -0,0 +1,7 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+. ./test-data</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#usb_rly08</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo "getting relay SN"</span><br><span style="color: hsl(120, 100%, 40%);">+echo -n "8" > $USB_RELAY</span><br><span>diff --git a/tests/sysmo-octsim/ctl_reset_target.sh b/tests/sysmo-octsim/ctl_reset_target.sh</span><br><span>index 6eed990..6aafaa2 100755</span><br><span>--- a/tests/sysmo-octsim/ctl_reset_target.sh</span><br><span>+++ b/tests/sysmo-octsim/ctl_reset_target.sh</span><br><span>@@ -1,7 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#usb_rly08 serial</span><br><span style="color: hsl(0, 100%, 40%);">-USB_RELAY="/dev/serial/by-id/usb-Devantech_Ltd._USB-RLY08_00021197-if00"</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span style="color: hsl(120, 100%, 40%);">+. ./test-data</span><br><span> </span><br><span> #usb_rly08</span><br><span> # relay1 = usbpower</span><br><span>diff --git a/tests/sysmo-octsim/ctl_reset_to_dfu.sh b/tests/sysmo-octsim/ctl_reset_to_dfu.sh</span><br><span>index 969ca0c..4807241 100755</span><br><span>--- a/tests/sysmo-octsim/ctl_reset_to_dfu.sh</span><br><span>+++ b/tests/sysmo-octsim/ctl_reset_to_dfu.sh</span><br><span>@@ -1,7 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#usb_rly08 serial</span><br><span style="color: hsl(0, 100%, 40%);">-USB_RELAY="/dev/serial/by-id/usb-Devantech_Ltd._USB-RLY08_00021197-if00"</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span style="color: hsl(120, 100%, 40%);">+. ./test-data</span><br><span> </span><br><span> #usb_rly08</span><br><span> # relay1 = usbpower</span><br><span>diff --git a/tests/sysmo-octsim/fetch_image.sh b/tests/sysmo-octsim/fetch_image.sh</span><br><span>index c0a4f8f..119d611 100755</span><br><span>--- a/tests/sysmo-octsim/fetch_image.sh</span><br><span>+++ b/tests/sysmo-octsim/fetch_image.sh</span><br><span>@@ -1,6 +1,6 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span> . ./test-data</span><br><span> </span><br><span> echo "fetch image"</span><br><span style="color: hsl(0, 100%, 40%);">-wget -O dl/sysmoOCTSIM-latest.bin http://ftp.osmocom.org/binaries/osmo-ccid-firmware/latest/sysmoOCTSIM.bin -nv</span><br><span style="color: hsl(120, 100%, 40%);">+wget -O $DFU_IMAGE http://ftp.osmocom.org/binaries/osmo-ccid-firmware/latest/sysmoOCTSIM.bin -nv</span><br><span> echo "done"</span><br><span>diff --git a/tests/sysmo-octsim/flash_octsim_dfu.sh b/tests/sysmo-octsim/flash_octsim_dfu.sh</span><br><span>index 5b9c19a..0e60c2e 100755</span><br><span>--- a/tests/sysmo-octsim/flash_octsim_dfu.sh</span><br><span>+++ b/tests/sysmo-octsim/flash_octsim_dfu.sh</span><br><span>@@ -1,3 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span style="color: hsl(120, 100%, 40%);">+. ./test-data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-dfu-util --device 1d50:6141 --alt 0 --reset --download dl/sysmoOCTSIM-latest.bin 2>/dev/null |grep -v "Download\t"|grep -v "\["</span><br><span style="color: hsl(120, 100%, 40%);">+dfu-util --device $USBD_TARGET --alt 0 --reset --download $DFU_IMAGE 2>/dev/null |grep -v "Download\t"|grep -v "\["</span><br><span style="color: hsl(120, 100%, 40%);">+sleep 1</span><br><span>diff --git a/tests/sysmo-octsim/get_installed_version.sh b/tests/sysmo-octsim/get_installed_version.sh</span><br><span>index be61865..e12e3fa 100755</span><br><span>--- a/tests/sysmo-octsim/get_installed_version.sh</span><br><span>+++ b/tests/sysmo-octsim/get_installed_version.sh</span><br><span>@@ -1,5 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span> . ./test-data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-echo -n "fw version: " 1>&2</span><br><span style="color: hsl(0, 100%, 40%);">-lsusb -d 1d50:6141 -v 2>/dev/null | grep iProduct|awk '{}{print $4}' 1>&2</span><br><span style="color: hsl(120, 100%, 40%);">+echo -n "installed fw version: " 1>&2</span><br><span style="color: hsl(120, 100%, 40%);">+lsusb -d $USBD_TARGET -v 2>/dev/null | grep iProduct|awk '{}{print $4}' 1>&2</span><br><span>diff --git a/tests/sysmo-octsim/prepare b/tests/sysmo-octsim/prepare</span><br><span>index bb95e40..b19fbed 100755</span><br><span>--- a/tests/sysmo-octsim/prepare</span><br><span>+++ b/tests/sysmo-octsim/prepare</span><br><span>@@ -1,8 +1,11 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span> </span><br><span> . ./test-data</span><br><span> </span><br><span> echo "================ PREPARING TEST RIG ================"</span><br><span style="color: hsl(120, 100%, 40%);">+if [ ! -h "$USB_RELAY" ]; then echo "ERROR: usb relay device - symlink missing" ; exit 1; fi</span><br><span style="color: hsl(120, 100%, 40%);">+if [ ! -c "$USB_RELAY" ]; then echo "ERROR: usb relay device - not a char device" ; exit 1; fi</span><br><span style="color: hsl(120, 100%, 40%);">+if [ ! -h "$USB_RELAY" ]; then echo "ERROR: usb relay device - not writable" ; exit 1; fi</span><br><span> ./ctl_reset_target.sh</span><br><span> echo "================ TEST RIG PREPARED ================="</span><br><span> echo ""</span><br><span>diff --git a/tests/sysmo-octsim/regen b/tests/sysmo-octsim/regen</span><br><span>index 7ed1fab..da1d8b1 100755</span><br><span>--- a/tests/sysmo-octsim/regen</span><br><span>+++ b/tests/sysmo-octsim/regen</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span> </span><br><span> echo "Regenerating test output..."</span><br><span> ./prepare</span><br><span>@@ -6,6 +6,8 @@</span><br><span> ./02_flash_dfu.sh > ./02_flash_dfu.out</span><br><span> ./03_check_lsusb.sh > ./03_check_lsusb.out</span><br><span> ./04_check_dfu_lsusb.sh > ./04_check_dfu_lsusb.out</span><br><span style="color: hsl(120, 100%, 40%);">+./05_flash_dfu_from_app.sh > ./05_flash_dfu_from_app.out</span><br><span style="color: hsl(120, 100%, 40%);">+./06_test_simcards.sh > ./06_test_simcards.out</span><br><span> echo "Reference output regenerated!"</span><br><span> echo ""</span><br><span> </span><br><span>diff --git a/tests/sysmo-octsim/run-tests b/tests/sysmo-octsim/run-tests</span><br><span>index b67c425..f4d5162 100755</span><br><span>--- a/tests/sysmo-octsim/run-tests</span><br><span>+++ b/tests/sysmo-octsim/run-tests</span><br><span>@@ -1,7 +1,7 @@</span><br><span> #!/bin/sh</span><br><span> </span><br><span> # default: execute all tests</span><br><span style="color: hsl(0, 100%, 40%);">-TESTS="01_check_rig.sh 02_flash_dfu.sh 03_check_lsusb.sh 04_check_dfu_lsusb.sh"</span><br><span style="color: hsl(120, 100%, 40%);">+TESTS="01_check_rig.sh 02_flash_dfu.sh 03_check_lsusb.sh 04_check_dfu_lsusb.sh 05_flash_dfu_from_app.sh 06_test_simcards.sh"</span><br><span> </span><br><span> # if command line specifies some specific tests, execute only those</span><br><span> if [ $# -ge 1 ]; then</span><br><span>@@ -13,6 +13,12 @@</span><br><span> </span><br><span> # prepare test card</span><br><span> ./prepare</span><br><span style="color: hsl(120, 100%, 40%);">+if [ $? -eq 0 ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Prepare done"</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Prepare Test FAILED!"</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 2</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> for T in $TESTS; do</span><br><span> echo "==> Executing Testcase $T"</span><br><span>diff --git a/tests/sysmo-octsim/test-data b/tests/sysmo-octsim/test-data</span><br><span>index e69de29..9220aad 100644</span><br><span>--- a/tests/sysmo-octsim/test-data</span><br><span>+++ b/tests/sysmo-octsim/test-data</span><br><span>@@ -0,0 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#usb_rly08 serial</span><br><span style="color: hsl(120, 100%, 40%);">+USB_RELAY="/dev/serial/by-id/usb-Devantech_Ltd._USB-RLY08_00021197-if00"</span><br><span style="color: hsl(120, 100%, 40%);">+USBD_RELAY="04d8:ffee"</span><br><span style="color: hsl(120, 100%, 40%);">+USBD_TARGET="1d50:6141"</span><br><span style="color: hsl(120, 100%, 40%);">+DFU_IMAGE="dl/sysmoOCTSIM-latest.bin"</span><br><span style="color: hsl(120, 100%, 40%);">+PYSIMREAD="/home/jenkins/dep/pysim/pySim-read.py"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257">change 17257</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I246224e29e5936b4fe40cf7d7a5ff83c9940d121 </div>
<div style="display:none"> Gerrit-Change-Number: 17257 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: roh <jsteiger@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: roh <jsteiger@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>