jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use short flag for identifying integration tests 

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-07-23 13:45:05 -07:00
parent 00047d5339
commit feb1d28456
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -31,4 +31,4 @@ script:
- if [ "$TRAVIS_GLOBAL_WTF" ]; then bash "$DOCKER_PATH/hack/make/validate-dco"; fi - if [ "$TRAVIS_GLOBAL_WTF" ]; then bash "$DOCKER_PATH/hack/make/validate-dco"; fi
- if [ "$TRAVIS_GLOBAL_WTF" ]; then bash "$DOCKER_PATH/hack/make/validate-gofmt"; fi - if [ "$TRAVIS_GLOBAL_WTF" ]; then bash "$DOCKER_PATH/hack/make/validate-gofmt"; fi
- if [ -z "$TRAVIS_GLOBAL_WTF" ]; then go build -v ./...; fi - if [ -z "$TRAVIS_GLOBAL_WTF" ]; then go build -v ./...; fi
- if [ -z "$TRAVIS_GLOBAL_WTF" -a "$GOARCH" != 'arm' ]; then go test -v . ./selinux ./cgroups ./cgroups/fs ./security/capabilities ./syncpipe; fi - if [ -z "$TRAVIS_GLOBAL_WTF" -a "$GOARCH" != 'arm' ]; then go test -test.short -v ./...; fi

8
netlink/netlink_linux_test.go
View File

@ -6,6 +6,10 @@ import (
) )
func TestCreateBridgeWithMac(t *testing.T) { func TestCreateBridgeWithMac(t *testing.T) {
if testing.Short() {
return
}
name := "testbridge" name := "testbridge"
if err := CreateBridge(name, true); err != nil { if err := CreateBridge(name, true); err != nil {
@ -28,6 +32,10 @@ func TestCreateBridgeWithMac(t *testing.T) {
} }
func TestCreateVethPair(t *testing.T) { func TestCreateVethPair(t *testing.T) {
if testing.Short() {
return
}
var ( var (
name1 = "veth1" name1 = "veth1"
name2 = "veth2" name2 = "veth2"