summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2008-10-30 16:58:32 +0000
committerWolfram Sang <w.sang@pengutronix.de>2008-10-30 16:58:32 +0000
commit1fcc903be5b0da583ff00a6a48c668b140a93eaa (patch)
tree22ddff80003521e083a078a1188456c69aff2ddf /tests
parent0858fbc689f4390e662c70976a926f1545ad9ae6 (diff)
downloadptxdist-1fcc903be5b0da583ff00a6a48c668b140a93eaa.tar.gz
ptxdist-1fcc903be5b0da583ff00a6a48c668b140a93eaa.tar.xz
* tests: bugfix scripts
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9005 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'tests')
-rwxr-xr-xtests/flash.kermit10
-rwxr-xr-xtests/setenv.kermit2
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/flash.kermit b/tests/flash.kermit
index 5eb565c69..44a0e21d2 100755
--- a/tests/flash.kermit
+++ b/tests/flash.kermit
@@ -1,13 +1,13 @@
define flash {
ptx_test_start "Flashing \%2"
+ .tftpfilename := \fbasename(\%1)
- if = \m(u_boot_version) 2 {
- ptx_uboot_exec 5 "\%2=\%1"
- ptx_uboot_exec 120 "update_\%2"
+ if = \m(uboot_version) 2 {
+ ptx_uboot_exec 600 "update_\%2 nor \m(tftpfilename)"
} else {
- ptx_uboot_exec 5 "setenv \%2 \%1"
- ptx_uboot_exec 120 "run update_\%2"
+ ptx_uboot_exec 5 "setenv \%2 \m(tftpfilename)"
+ ptx_uboot_exec 600 "run update_\%2"
}
ptx_test_end
}
diff --git a/tests/setenv.kermit b/tests/setenv.kermit
index 3813d9eeb..5a8978bc9 100755
--- a/tests/setenv.kermit
+++ b/tests/setenv.kermit
@@ -79,7 +79,7 @@ define setenv_uboot_v2 {
ptx_uboot_exec_single "Reloading new environment" 10 "loadenv"
- ptx_test_start "Updating MAC address"
+ ptx_test_start "Restoring MAC address"
ptx_uboot_exec 5 "echo -a /env/config eth0.ethaddr=$eth0.ethaddr"
ptx_uboot_exec 10 "saveenv"
ptx_uboot_exec 3 "protect /dev/env0"