aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2015-05-13 16:04:47 +0200
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2015-05-13 16:06:55 +0200
commit7dd3f12ca1828ac5b799fae831703a02dd13e1e3 (patch)
tree4de4477562ade01a1f1201d6dc8fc136f88d7cdb
parent9f8bbdcc202517c5c2a8656bf6e2c0e5f58a4950 (diff)
Robustify runtest check to see if board supports schroots
Current test breaks when using extra dejagnu verbosity due to expecting certain patterns to be no more than 5 lines apart. Change-Id: I67f596868fe4a68950bbc117652bf88b31a52188
-rwxr-xr-xlib/schroot.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/schroot.sh b/lib/schroot.sh
index 8bd5a97b..373726c9 100755
--- a/lib/schroot.sh
+++ b/lib/schroot.sh
@@ -13,10 +13,10 @@ print_schroot_board_files()
fi
# Run dummy runtest to figure out which target boards load schroot-ssh.exp
- runtest $target --tool none 2>&1 \
- | grep -B5 "^Using .*/schroot-ssh.exp as generic interface file for target\.\$" \
- | grep "^Using .* as board description file for target\.\$" \
- | sed -e "s/^Using \(.*\) as board description file for target\.\$/\1/"
+ runtest $target --tool none 2>&1 | awk '
+/^Using .* as board description file for target\.$/ { board=$2 }
+/^Using .*\/schroot-ssh.exp as generic interface file for target\.$/ { print board }
+'
rm -f none.log none.sum
}