summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2009-01-29 15:38:51 +0000
committerWolfram Sang <w.sang@pengutronix.de>2009-01-29 15:38:51 +0000
commit2015455eb6244a9a391fe6f719d00a32693a0efd (patch)
tree55614218f06b7ff0781541419b85d3c90d6c1b3c /tests
parent0fbd220ae6267a405ff9b7b8f6f1de20fc3d0f57 (diff)
downloadptxdist-2015455eb6244a9a391fe6f719d00a32693a0efd.tar.gz
ptxdist-2015455eb6244a9a391fe6f719d00a32693a0efd.tar.xz
* tests: handle weird CRs from U-Boot-V1
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9676 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'tests')
-rwxr-xr-xtests/setenv.kermit8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/setenv.kermit b/tests/setenv.kermit
index e7320fea3..eec5a87b2 100755
--- a/tests/setenv.kermit
+++ b/tests/setenv.kermit
@@ -20,10 +20,12 @@ define setenv_uboot_v1 {
ptx_check_fail "Did not get old environment"
# quit on u-boot-prompt
if = \v(minput) 2 break
+ # Remove all CR, they just cause trouble
+ assign input \freplace(\v(input),\13,,)
# if no '=' then continue
- if not match \v(input) *=* goto out
- # extract part before '=' (from \v(input) the first word, allow '_')
- assign envvar \fword(\v(input),1,,_)
+ if not match \m(input) *=* goto out
+ # extract part before '=' (from \m(input) the first word, allow '_')
+ assign envvar \fword(\m(input),1,,_)
# skip special keywords
if not = \farraylook(^\m(envvar)$,&s) -1 goto out
# put setenv-command into array