kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #25799 from vdemeester/25313-integration-no-cover

Browse source 
Disable coverage on test-integration-cli
This commit is contained in:
Sebastiaan van Stijn 2016-08-19 14:31:24 +02:00 • committed by GitHub
commit d6c75c3138
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hack/make.sh
View file

@ -73,7 +73,6 @@ DEFAULT_BUNDLES=(
test-integration-cli test-integration-cli
test-docker-py test-docker-py
cover
cross cross
tgz tgz
) )

13
hack/make/.integration-test-helpers
View file

@ -23,22 +23,15 @@ go_test_dir() {
testcover=() testcover=()
testcoverprofile=() testcoverprofile=()
testbinary="$DEST/test.main" testbinary="$DEST/test.main"
if [ "$HAVE_GO_TEST_COVER" ]; then
# if our current go install has -cover, we want to use it :)
mkdir -p "$DEST/coverprofiles"
coverprofile="docker${dir#.}"
coverprofile="$ABS_DEST/coverprofiles/${coverprofile//\//-}"
testcover=( -test.cover )
testcoverprofile=( -test.coverprofile "$coverprofile" $coverpkg )
fi
( (
mkdir -p "$DEST/coverprofiles"
echo '+ go test' $TESTFLAGS "${DOCKER_PKG}${dir#.}" echo '+ go test' $TESTFLAGS "${DOCKER_PKG}${dir#.}"
cd "$dir" cd "$dir"
export DEST="$ABS_DEST" # in a subshell this is safe -- our integration-cli tests need DEST, and "cd" screws it up export DEST="$ABS_DEST" # in a subshell this is safe -- our integration-cli tests need DEST, and "cd" screws it up
go test -c -o "$testbinary" ${testcover[@]} -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" go test -c -o "$testbinary" -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}"
i=0 i=0
while ((++i)); do while ((++i)); do
test_env "$testbinary" ${testcoverprofile[@]} $TESTFLAGS test_env "$testbinary" $TESTFLAGS
if [ $i -gt "$TEST_REPEAT" ]; then if [ $i -gt "$TEST_REPEAT" ]; then
break break
fi fi