mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Update test scripts to always run ALL tests, even when some fail
This commit is contained in:
parent
bcdeb37bb6
commit
f1e6dce047
2 changed files with 55 additions and 21 deletions
|
@ -19,18 +19,35 @@ fi
|
||||||
bundle_test() {
|
bundle_test() {
|
||||||
{
|
{
|
||||||
date
|
date
|
||||||
for test_dir in $(find_test_dirs); do (
|
|
||||||
set -x
|
TESTS_FAILED=()
|
||||||
cd $test_dir
|
for test_dir in $(find_test_dirs); do
|
||||||
|
echo
|
||||||
|
|
||||||
# Install packages that are dependencies of the tests.
|
if ! (
|
||||||
# Note: Does not run the tests.
|
set -x
|
||||||
go test -i -ldflags "$LDFLAGS" $BUILDFLAGS
|
cd $test_dir
|
||||||
|
|
||||||
# Run the tests with the optional $TESTFLAGS.
|
# Install packages that are dependencies of the tests.
|
||||||
export TEST_DOCKERINIT_PATH=$DEST/../dynbinary/dockerinit-$VERSION
|
# Note: Does not run the tests.
|
||||||
go test -v -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS $TESTFLAGS
|
go test -i -ldflags "$LDFLAGS" $BUILDFLAGS
|
||||||
) done
|
|
||||||
|
# Run the tests with the optional $TESTFLAGS.
|
||||||
|
export TEST_DOCKERINIT_PATH=$DEST/../dynbinary/dockerinit-$VERSION
|
||||||
|
go test -v -ldflags "$LDFLAGS -X github.com/dotcloud/docker/utils.INITSHA1 \"$DOCKER_INITSHA1\"" $BUILDFLAGS $TESTFLAGS
|
||||||
|
); then
|
||||||
|
TESTS_FAILED+=("$test_dir")
|
||||||
|
sleep 1 # give it a second, so observers watching can take note
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# if some tests fail, we want the bundlescript to fail, but we want to
|
||||||
|
# try running ALL the tests first, hence TESTS_FAILED
|
||||||
|
if [ "${#TESTS_FAILED[@]}" -gt 0 ]; then
|
||||||
|
echo
|
||||||
|
echo "Test failures in: ${TESTS_FAILED[@]}"
|
||||||
|
false
|
||||||
|
fi
|
||||||
} 2>&1 | tee $DEST/test.log
|
} 2>&1 | tee $DEST/test.log
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,17 +13,34 @@ set -e
|
||||||
bundle_test() {
|
bundle_test() {
|
||||||
{
|
{
|
||||||
date
|
date
|
||||||
for test_dir in $(find_test_dirs); do (
|
|
||||||
set -x
|
TESTS_FAILED=()
|
||||||
cd $test_dir
|
for test_dir in $(find_test_dirs); do
|
||||||
|
echo
|
||||||
|
|
||||||
# Install packages that are dependencies of the tests.
|
if ! (
|
||||||
# Note: Does not run the tests.
|
set -x
|
||||||
go test -i -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS
|
cd $test_dir
|
||||||
|
|
||||||
# Run the tests with the optional $TESTFLAGS.
|
# Install packages that are dependencies of the tests.
|
||||||
go test -v -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS $TESTFLAGS
|
# Note: Does not run the tests.
|
||||||
) done
|
go test -i -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS
|
||||||
|
|
||||||
|
# Run the tests with the optional $TESTFLAGS.
|
||||||
|
go test -v -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS $TESTFLAGS
|
||||||
|
); then
|
||||||
|
TESTS_FAILED+=("$test_dir")
|
||||||
|
sleep 1 # give it a second, so observers watching can take note
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# if some tests fail, we want the bundlescript to fail, but we want to
|
||||||
|
# try running ALL the tests first, hence TESTS_FAILED
|
||||||
|
if [ "${#TESTS_FAILED[@]}" -gt 0 ]; then
|
||||||
|
echo
|
||||||
|
echo "Test failures in: ${TESTS_FAILED[@]}"
|
||||||
|
false
|
||||||
|
fi
|
||||||
} 2>&1 | tee $DEST/test.log
|
} 2>&1 | tee $DEST/test.log
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue