Skip to content

Commit fca3cae

Browse files
committedDec 9, 2014
Update code for writing/parsing test info log sections
1 parent 847611e commit fca3cae

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎nested-kvm-ctrl.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export postout_START='*post*' # this line will be deleted soon
7777

7878
info_section_START='\*\* *((( Begin info*'
7979
test_section_START='\*\* *((( Begin test*'
80-
test_section_START='*from*' # this line will be deleted soon
8180

8281
default-environment-params()
8382
{
@@ -376,9 +375,10 @@ do-dotest() # wrap a piped in test script with status
376375
do-status 4
377376
;;
378377
esac
379-
echo "$ORGPRE test script from: $*" # the test script should send its name to -dotest
378+
echo "$ORGPRE ((( Begin test: $*" # the test script should send its name to -dotest
380379
ORGPRE="*$ORGPRE"
381380
time ( do-doscript "$k" bash ; echo "$ORGPRE post test" )
381+
echo " end test )))"
382382
echo " End test: $* out]]]"
383383
echo " End test: $* err]]]" 1>&2
384384
}
@@ -459,7 +459,7 @@ do-cleanlog()
459459
;;
460460
$test_section_START)
461461
sectiontestscript="${ln#*: }"
462-
read sname rest <<<"$sectiontestscript"
462+
IFS=' ' read sname rest <<<"$sectiontestscript"
463463
fullpath="$(readlink -f "$sname")"
464464
if [ -x "$fullpath" ]; then
465465
# The following code is really just a pipe: P1 | P2

‎test-just-generate-some-log.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
thetest()
44
{
5-
./nested-kvm-ctrl.sh 2 -dotest "${0##*/}" <<EOF
5+
./nested-kvm-ctrl.sh 2 -dotest "${0##*/} $*" <<EOF
66
sleep 2
77
echo hey
88
pstree -pa \$\$

0 commit comments

Comments
 (0)
Please sign in to comment.