mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #3000 from creack/improve_make_sh_test
Improve make sh test
This commit is contained in:
commit
51b9fe7301
1 changed files with 18 additions and 7 deletions
|
@ -4,6 +4,10 @@ DEST=$1
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
TEXTRESET=$'\033[0m' # reset the foreground colour
|
||||||
|
RED=$'\033[31m'
|
||||||
|
GREEN=$'\033[32m'
|
||||||
|
|
||||||
# Run Docker's test suite, including sub-packages, and store their output as a bundle
|
# Run Docker's test suite, including sub-packages, and store their output as a bundle
|
||||||
# If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'.
|
# If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'.
|
||||||
# You can use this to select certain tests to run, eg.
|
# You can use this to select certain tests to run, eg.
|
||||||
|
@ -30,6 +34,9 @@ bundle_test() {
|
||||||
go test -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS $TESTFLAGS
|
go test -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS $TESTFLAGS
|
||||||
); then
|
); then
|
||||||
TESTS_FAILED+=("$test_dir")
|
TESTS_FAILED+=("$test_dir")
|
||||||
|
echo
|
||||||
|
echo "${RED}Test Failed: $test_dir${TEXTRESET}"
|
||||||
|
echo
|
||||||
sleep 1 # give it a second, so observers watching can take note
|
sleep 1 # give it a second, so observers watching can take note
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
@ -38,8 +45,12 @@ bundle_test() {
|
||||||
# try running ALL the tests first, hence TESTS_FAILED
|
# try running ALL the tests first, hence TESTS_FAILED
|
||||||
if [ "${#TESTS_FAILED[@]}" -gt 0 ]; then
|
if [ "${#TESTS_FAILED[@]}" -gt 0 ]; then
|
||||||
echo
|
echo
|
||||||
echo "Test failures in: ${TESTS_FAILED[@]}"
|
echo "${RED}Test failures in: ${TESTS_FAILED[@]}${TEXTRESET}"
|
||||||
false
|
false
|
||||||
|
else
|
||||||
|
echo
|
||||||
|
echo "${GREEN}Test success${TEXTRESET}"
|
||||||
|
true
|
||||||
fi
|
fi
|
||||||
} 2>&1 | tee $DEST/test.log
|
} 2>&1 | tee $DEST/test.log
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue