summaryrefslogtreecommitdiff
path: root/merge_test.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2016-08-27 19:21:05 +0200
committerCarlos Martín Nieto <[email protected]>2016-08-27 19:21:05 +0200
commite55c00eca7e70e2d02860cda3cdc9169a88ece36 (patch)
tree8771d83cc80bb0b48c3e2d87d76156858b3371b4 /merge_test.go
parent1670c49c7e02ba38aa10072a102a33c3e6d5e1c3 (diff)
Run the tests in parallel
This saves about 1s, or 1/3 of the test runtime. The linking is still much slower, but this we can control.
Diffstat (limited to 'merge_test.go')
-rw-r--r--merge_test.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/merge_test.go b/merge_test.go
index 8059727..f2c84bc 100644
--- a/merge_test.go
+++ b/merge_test.go
@@ -6,6 +6,7 @@ import (
)
func TestMergeWithSelf(t *testing.T) {
+ t.Parallel()
repo := createTestRepo(t)
defer cleanupTestRepo(t, repo)
@@ -24,6 +25,7 @@ func TestMergeWithSelf(t *testing.T) {
}
func TestMergeAnalysisWithSelf(t *testing.T) {
+ t.Parallel()
repo := createTestRepo(t)
defer cleanupTestRepo(t, repo)
@@ -46,6 +48,7 @@ func TestMergeAnalysisWithSelf(t *testing.T) {
}
func TestMergeSameFile(t *testing.T) {
+ t.Parallel()
file := MergeFileInput{
Path: "test",
Mode: 33188,
@@ -68,6 +71,7 @@ func TestMergeSameFile(t *testing.T) {
}
func TestMergeTreesWithoutAncestor(t *testing.T) {
+ t.Parallel()
repo := createTestRepo(t)
defer cleanupTestRepo(t, repo)
@@ -125,6 +129,7 @@ func appendCommit(t *testing.T, repo *Repository) (*Oid, *Oid) {
}
func TestMergeBase(t *testing.T) {
+ t.Parallel()
repo := createTestRepo(t)
defer cleanupTestRepo(t, repo)