Merge pull request moby#17786 from Microsoft/10662-nativetestunit

vdemeester · vdemeester · commit e2a9eede2800 · 2015-11-08T11:12:09.000+01:00
Windows: Native make test-unit
diff --git a/hack/make/test-unit b/hack/make/test-unit
@@ -25,7 +25,8 @@ bundle_test_unit() {
 	go test $COVER $GCCGOFLAGS -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS $pkg_list
 }
 
-if [[ "$(go version)" =~ "gccgo" ]]; then
+
+if [[ "$(go version)" == *"gccgo"* ]]; then
 	GCCGOFLAGS=-gccgoflags="-lpthread"
 else
 	COVER=-cover

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ bundle_test_unit() {`
`25`	`25`	`go test $COVER $GCCGOFLAGS -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS $pkg_list`
`26`	`26`	`}`
`27`	`27`
`28`		`-if [[ "$(go version)" =~ "gccgo" ]]; then`
	`28`	`+`
	`29`	`+if [[ "$(go version)" == "gccgo" ]]; then`
`29`	`30`	`GCCGOFLAGS=-gccgoflags="-lpthread"`
`30`	`31`	`else`
`31`	`32`	`COVER=-cover`