Merge pull request #3000 from creack/improve_make_sh_test

Improve make sh test
This commit is contained in:
Michael Crosby 2013-12-04 10:41:55 -08:00
commit 51b9fe7301
1 changed files with 18 additions and 7 deletions

View File

@ -4,42 +4,53 @@ 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.
# #
# TESTFLAGS='-run ^TestBuild$' ./hack/make.sh test # TESTFLAGS='-run ^TestBuild$' ./hack/make.sh test
# #
bundle_test() { bundle_test() {
{ {
date date
TESTS_FAILED=() TESTS_FAILED=()
for test_dir in $(find_test_dirs); do for test_dir in $(find_test_dirs); do
echo echo
if ! ( if ! (
set -x set -x
cd $test_dir cd $test_dir
# Install packages that are dependencies of the tests. # Install packages that are dependencies of the tests.
# Note: Does not run the tests. # Note: Does not run the tests.
go test -i -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS go test -i -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS
# Run the tests with the optional $TESTFLAGS. # Run the tests with the optional $TESTFLAGS.
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
# if some tests fail, we want the bundlescript to fail, but we want to # if some tests fail, we want the bundlescript to fail, but we want to
# 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
} }