docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify and resync hack/make/test and hack/make/dyntest output handling

This commit is contained in:
Tianon Gravi 2013-12-08 12:57:11 -07:00
parent d502f0cfac
commit 416b16e1e2
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hack/make/dyntest
View File

@ -10,6 +10,10 @@ if [ ! -x "$INIT" ]; then
false false
fi fi
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.
@ -37,16 +41,26 @@ bundle_test() {
go test -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS $TESTFLAGS go test -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS $TESTFLAGS
); then ); then
TESTS_FAILED+=("$test_dir") TESTS_FAILED+=("$test_dir")
echo
echo "${RED}Tests failed: $test_dir${TEXTRESET}"
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
echo
echo
echo
# 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 "${RED}Test failures in: ${TESTS_FAILED[@]}${TEXTRESET}"
echo echo
echo "Test failures in: ${TESTS_FAILED[@]}"
false false
else
echo "${GREEN}Test success${TEXTRESET}"
echo
true
fi fi
} 2>&1 | tee $DEST/test.log } 2>&1 | tee $DEST/test.log
} }

11
hack/make/test
View File

@ -35,21 +35,24 @@ bundle_test() {
); then ); then
TESTS_FAILED+=("$test_dir") TESTS_FAILED+=("$test_dir")
echo echo
echo "${RED}Test Failed: $test_dir${TEXTRESET}" echo "${RED}Tests 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
echo
echo
echo
# 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 "${RED}Test failures in: ${TESTS_FAILED[@]}${TEXTRESET}" echo "${RED}Test failures in: ${TESTS_FAILED[@]}${TEXTRESET}"
echo
false false
else else
echo
echo "${GREEN}Test success${TEXTRESET}" echo "${GREEN}Test success${TEXTRESET}"
echo
true true
fi fi
} 2>&1 | tee $DEST/test.log } 2>&1 | tee $DEST/test.log