| ... | ... |
@@ -7,25 +7,25 @@ set -e |
| 7 | 7 |
# Run Docker's test suite, including sub-packages, and store their output as a bundle |
| 8 | 8 |
# If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'. |
| 9 | 9 |
# You can use this to select certain tests to run, eg. |
| 10 |
-# |
|
| 10 |
+# |
|
| 11 | 11 |
# TESTFLAGS='-run ^TestBuild$' ./hack/make.sh test |
| 12 | 12 |
# |
| 13 | 13 |
bundle_test() {
|
| 14 | 14 |
{
|
| 15 | 15 |
date |
| 16 |
- |
|
| 16 |
+ |
|
| 17 | 17 |
TESTS_FAILED=() |
| 18 | 18 |
for test_dir in $(find_test_dirs); do |
| 19 | 19 |
echo |
| 20 |
- |
|
| 20 |
+ |
|
| 21 | 21 |
if ! ( |
| 22 | 22 |
set -x |
| 23 | 23 |
cd $test_dir |
| 24 |
- |
|
| 24 |
+ |
|
| 25 | 25 |
# Install packages that are dependencies of the tests. |
| 26 | 26 |
# Note: Does not run the tests. |
| 27 | 27 |
go test -i -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS |
| 28 |
- |
|
| 28 |
+ |
|
| 29 | 29 |
# Run the tests with the optional $TESTFLAGS. |
| 30 | 30 |
go test -ldflags "$LDFLAGS $LDFLAGS_STATIC" $BUILDFLAGS $TESTFLAGS |
| 31 | 31 |
); then |
| ... | ... |
@@ -33,7 +33,7 @@ bundle_test() {
|
| 33 | 33 |
sleep 1 # give it a second, so observers watching can take note |
| 34 | 34 |
fi |
| 35 | 35 |
done |
| 36 |
- |
|
| 36 |
+ |
|
| 37 | 37 |
# if some tests fail, we want the bundlescript to fail, but we want to |
| 38 | 38 |
# try running ALL the tests first, hence TESTS_FAILED |
| 39 | 39 |
if [ "${#TESTS_FAILED[@]}" -gt 0 ]; then
|