Merge pull request ethereum#3041 from fjl/build-less-parallel

karalabe · web-flow · commit 61734cc7ae8d · 2016-09-26T16:31:10.000+03:00
build: limit test concurrency
diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,6 @@ go_import_path: github.com/ethereum/go-ethereum
 sudo: false
 matrix:
   include:
-    - os: linux
-      dist: trusty
-      go: 1.4.2
     - os: linux
       dist: trusty
       go: 1.5.4
diff --git a/build/ci.go b/build/ci.go
@@ -227,6 +227,9 @@ func doTest(cmdline []string) {
 
 	// Run the actual tests.
 	gotest := goTool("test")
+	// Test a single package at a time. CI builders are slow
+	// and some tests run into timeouts under load.
+	gotest.Args = append(gotest.Args, "-p", "1")
 	if *coverage {
 		gotest.Args = append(gotest.Args, "-covermode=atomic", "-cover")
 	}

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,9 @@ func doTest(cmdline []string) {`
`227`	`227`
`228`	`228`	`// Run the actual tests.`
`229`	`229`	`gotest := goTool("test")`
	`230`	`+ // Test a single package at a time. CI builders are slow`
	`231`	`+ // and some tests run into timeouts under load.`
	`232`	`+ gotest.Args = append(gotest.Args, "-p", "1")`
`230`	`233`	`if *coverage {`
`231`	`234`	`gotest.Args = append(gotest.Args, "-covermode=atomic", "-cover")`
`232`	`235`	`}`