Changelog & version bump for 8.6.0

thought-machine · Aug 24, 2017 · 46f88d9 · 46f88d9
1 parent 24fc668
commit 46f88d9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Version 8.6.0
+-------------
+
+    * Optional support for per-test metrics.
+
+
 Version 8.5.4
 -------------
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.5.4
+8.6.0
diff --git a/src/test/container.go b/src/test/container.go
@@ -3,7 +3,6 @@
 package test
 
 import (
-	"context"
 	"fmt"
 	"io/ioutil"
 	"path"
@@ -47,7 +46,7 @@ func runContainerisedTest(state *core.BuildState, target *core.BuildTarget) ([]b
 	command = append(command, "-v", testDir+":/tmp/test_in", "-w", "/tmp/test_in", containerName, "bash", "-o", "pipefail", "-c", replacedCmd)
 	log.Debug("Running containerised test %s: %s", target.Label, strings.Join(command, " "))
 	_, out, err := core.ExecWithTimeout(target, target.TestDir(), nil, target.TestTimeout, state.Config.Test.Timeout, state.ShowAllOutput, command)
-	retrieveResultsAndRemoveContainer(target, cidfile, err == context.DeadlineExceeded)
+	retrieveResultsAndRemoveContainer(target, cidfile, err == nil)
 	return out, err
 }