summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJochen Frieling <j.frieling@pengutronix.de>2009-01-19 15:24:40 +0000
committerJochen Frieling <j.frieling@pengutronix.de>2009-01-19 15:24:40 +0000
commit40b31f9d186733af50a407208fe802f5b50c657e (patch)
treed29f1c3867233deb5ecbe24341fabf315b0d1652 /tests
parentc2fa53c70643d99ed16745368a94ea0a905bc980 (diff)
downloadptxdist-40b31f9d186733af50a407208fe802f5b50c657e.tar.gz
ptxdist-40b31f9d186733af50a407208fe802f5b50c657e.tar.xz
* libptxdisttest.sh: executing commands locally (host) should work this way
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9588 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'tests')
-rw-r--r--tests/libptxdisttest.sh27
1 files changed, 7 insertions, 20 deletions
diff --git a/tests/libptxdisttest.sh b/tests/libptxdisttest.sh
index 92694f000..e15246157 100644
--- a/tests/libptxdisttest.sh
+++ b/tests/libptxdisttest.sh
@@ -188,26 +188,13 @@ remote() {
}
host() {
- echo "ssh -q -o StrictHostKeyChecking=no localhost ${PTXCONF_BOARDSETUP_TARGETIP} \"$1\"" >> "$LOGFILE"
- local stdoutret=$(ssh -q -o StrictHostKeyChecking=no localhost "$1"'; echo ret=$?') 2>> "$LOGFILE"
- #local stdoutret=$($1; echo ret=$?) 2>> "$LOGFILE"
- reportwrite host "$1"
- local stdout=$(echo "$stdoutret" | head -n-1)
- local retvalline=$(echo "$stdoutret" | tail -n1)
- if [ "${retvalline:0:4}" = "ret=" ]
- then # The "ret=" is on a line of its own
- local retvallinestdoutpart=""
- local retvallineretpart=""
- else # There was no newline before "ret="
- local retvallineretpart=$(expr "$retvalline" : '.*\(ret=.*\)')
- local retvallinestdoutpart="${retvalline%$retvallineretpart}"
- retvalline="$retvallineretpart"
- fi
- echo "$stdout"
- echo -n "$retvallinestdoutpart"
- reportwrite stdout "${stdout}${retvallinestdoutpart}"
- reportwrite exitstatus ${retvalline:4}
- return ${retvalline:4}
+ echo "${1}" >> "$LOGFILE"
+ reportwrite host "${1}"
+ local stdout=$(${1}) 2>> "$LOGFILE"
+ local retval=$?
+ reportwrite stdout "${stdout}"
+ reportwrite exitstatus ${retval}
+ return ${retval}
}