diff options
| -rwxr-xr-x | tests/flash.kermit | 4 | ||||
| -rw-r--r-- | tests/libptxdisttest.kermit | 2 |
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'" |