summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2009-01-19 11:40:43 +0000
committerWolfram Sang <w.sang@pengutronix.de>2009-01-19 11:40:43 +0000
commitc2fa53c70643d99ed16745368a94ea0a905bc980 (patch)
treee12cbf80bac5aea63cc813dd33126f1749c4f5b8 /tests
parent2edc209d46275523030866c541f5017b08e183cc (diff)
downloadptxdist-c2fa53c70643d99ed16745368a94ea0a905bc980.tar.gz
ptxdist-c2fa53c70643d99ed16745368a94ea0a905bc980.tar.xz
* tests: find more errors during flash
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9587 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'tests')
-rwxr-xr-xtests/flash.kermit4
-rw-r--r--tests/libptxdisttest.kermit2
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/flash.kermit b/tests/flash.kermit
index 44a0e21d2..fe211abc7 100755
--- a/tests/flash.kermit
+++ b/tests/flash.kermit
@@ -2,12 +2,12 @@
define flash {
ptx_test_start "Flashing \%2"
.tftpfilename := \fbasename(\%1)
-
+
if = \m(uboot_version) 2 {
ptx_uboot_exec 600 "update_\%2 nor \m(tftpfilename)"
} else {
ptx_uboot_exec 5 "setenv \%2 \m(tftpfilename)"
- ptx_uboot_exec 600 "run update_\%2"
+ ptx_uboot_exec 600 "run update_\%2" "Copy to Flash... done"
}
ptx_test_end
}
diff --git a/tests/libptxdisttest.kermit b/tests/libptxdisttest.kermit
index 142f20b9f..915d9ea4a 100644
--- a/tests/libptxdisttest.kermit
+++ b/tests/libptxdisttest.kermit
@@ -106,8 +106,10 @@ define ptx_uboot_enter_shell {
}
define ptx_uboot_exec {
+ # %1 = timeout value, %2 = command, %3 = extra string to wait for (optional)
ptx_lineout "\%2"
+ if not equal "\%3" "" ptx_wait_string "\%1" "\%3"
input \%1 \m(uboot_prompt)
ptx_check_fail "timeout while waiting for u-boot prompt after '\%2'"