ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make test: tweak helper scripts

Browse Source 
Change-Id: Iee6016757e45c832e8868f0bdcfd4192dd3380c8
Signed-off-by: Klement Sekera <ksekera@cisco.com>
This commit is contained in:
Klement Sekera
2017-04-03 04:21:46 +00:00
committed by Damjan Marion
parent c966ecd11c
commit a657e4e7c9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/scripts/git_pull_or_clean.sh
View File

@ -1,3 +1,8 @@
#!/bin/sh
CMD='git clean -dfX */'
git pull | grep -q -v 'Already up-to-date.' || git clean -dfX */
if git pull | grep -v 'Already up-to-date.'
then
echo "Executing $CMD"
$CMD
fi

4
test/scripts/test-loop.sh
View File

@ -94,7 +94,7 @@ do
if [[ "$PRE_EXEC_CMD" != "" ]]
then
echo "Executing \`$PRE_EXEC_CMD' before test.."
if ! ($PRE_EXEC_CMD 2>$TMP 1>$TMP)
if ! ($PRE_EXEC_CMD 2>&1 | tee $TMP)
then
echo "\`$PRE_EXEC_CMD' failed!" >&2
REASON="$PRE_EXEC_CMD failed"
@ -102,7 +102,7 @@ do
fi
fi
echo -n "Running test iteration #$COUNT..."
if ! ($CMD 2>$TMP 1>$TMP)
if ! ($CMD >$TMP 2>&1)
then
AFTER=`date +%s`
RUNTIME=$((AFTER-BEFORE))