diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2008-10-31 12:32:44 +0000 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2008-10-31 12:32:44 +0000 |
| commit | 05429c888974be5c3cf321e1a87b449c0432e3bc (patch) | |
| tree | d2d4acf4e51b15e4974830103ff6919929c94228 /tests | |
| parent | 7556830ed03d1b5b8ea124b381681b99f29ccdaf (diff) | |
| download | ptxdist-05429c888974be5c3cf321e1a87b449c0432e3bc.tar.gz ptxdist-05429c888974be5c3cf321e1a87b449c0432e3bc.tar.xz | |
* tests: make setenv more robust
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9010 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/make_uboot_v2_env | 3 | ||||
| -rwxr-xr-x | tests/setenv.kermit | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/make_uboot_v2_env b/tests/make_uboot_v2_env index e75e19683..f436ae3b4 100755 --- a/tests/make_uboot_v2_env +++ b/tests/make_uboot_v2_env @@ -1,7 +1,6 @@ #!/bin/bash -#FIXME: quit if error - +set -e PTXDIST_SETENV_U_BOOT_V2_ENV="${1}" ENVTMPDIR="$(mktemp -d "${PTXDIST_TEMPDIR}/uboot_v2_env.XXXXXX")" diff --git a/tests/setenv.kermit b/tests/setenv.kermit index 5a8978bc9..a92e6db4c 100755 --- a/tests/setenv.kermit +++ b/tests/setenv.kermit @@ -55,9 +55,9 @@ define setenv_uboot_v1 { define setenv_uboot_v2 { - ! \%1/make_uboot_v2_env \%3 + run \%1/make_uboot_v2_env \%3 if > \v(pexitstat) 0 { - writeln ERROR "FAILED! Could not generate new environment" + writeln ERROR "FAILED! Could not generate new environment (also check \$(PTXDIST_PLATFORMDIR)/test.log)" exit 1 } .imagename := \fbasename(\%3) @@ -69,7 +69,10 @@ define setenv_uboot_v2 { ptx_uboot_exec 3 "eth0.netmask=\m(PTXCONF_BOARDSETUP_NETMASK)" ptx_test_end - ptx_uboot_exec_single "Getting default environment" 15 "tftp \m(imagename)" + ptx_test_start "Getting default environment" + ptx_uboot_exec 15 "ping $eth0.serverip" + ptx_uboot_exec 15 "tftp \m(imagename)" + ptx_test_end ptx_test_start "Flashing default environment" ptx_uboot_exec 3 "unprotect /dev/env0" |