From a3d66c44aff84db2ace4fdafa3e6f6f9fb342d80 Mon Sep 17 00:00:00 2001
From: Tachikoma <tac.nil@outlook.com>
Date: Mon, 22 Dec 2014 20:37:59 +0800
Subject: [PATCH 1/2] update regexStatus to support go 1.4

---
 parser.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parser.go b/parser.go
index 0fb6aac..3d8213e 100644
--- a/parser.go
+++ b/parser.go
@@ -34,7 +34,7 @@ type Test struct {
 }
 
 var (
-	regexStatus = regexp.MustCompile(`^--- (PASS|FAIL|SKIP): (.+) \((\d+\.\d+) seconds\)$`)
+	regexStatus = regexp.MustCompile(`^--- (PASS|FAIL|SKIP): (.+) \((\d+\.\d+)(?: seconds|s)\)$`)
 	regexResult = regexp.MustCompile(`^(ok|FAIL)\s+(.+)\s(\d+\.\d+)s$`)
 )
 

From 4aa31fc44046f463d58e24ac13907f81d55ed2df Mon Sep 17 00:00:00 2001
From: Tachikoma <tac.nil@outlook.com>
Date: Mon, 22 Dec 2014 20:38:28 +0800
Subject: [PATCH 2/2] add test for go 1.4 support

---
 go-junit-report_test.go | 26 ++++++++++++++++++++++++++
 tests/04-go_1_4.txt     |  6 ++++++
 tests/04-report.xml     |  8 ++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 tests/04-go_1_4.txt
 create mode 100644 tests/04-report.xml

diff --git a/go-junit-report_test.go b/go-junit-report_test.go
index 471e833..853d614 100644
--- a/go-junit-report_test.go
+++ b/go-junit-report_test.go
@@ -102,6 +102,32 @@ var testCases []TestCase = []TestCase{
 			},
 		},
 	},
+	{
+		name:       "04-go_1_4.txt",
+		reportName: "04-report.xml",
+		report: &Report{
+			Packages: []Package{
+				{
+					Name: "package/name",
+					Time: 160,
+					Tests: []Test{
+						{
+							Name:   "TestOne",
+							Time:   60,
+							Result: PASS,
+							Output: []string{},
+						},
+						{
+							Name:   "TestTwo",
+							Time:   100,
+							Result: PASS,
+							Output: []string{},
+						},
+					},
+				},
+			},
+		},
+	},
 }
 
 func TestParser(t *testing.T) {
diff --git a/tests/04-go_1_4.txt b/tests/04-go_1_4.txt
new file mode 100644
index 0000000..13fe892
--- /dev/null
+++ b/tests/04-go_1_4.txt
@@ -0,0 +1,6 @@
+=== RUN TestOne
+--- PASS: TestOne (0.06s)
+=== RUN TestTwo
+--- PASS: TestTwo (0.10s)
+PASS
+ok  	package/name	0.160s
\ No newline at end of file
diff --git a/tests/04-report.xml b/tests/04-report.xml
new file mode 100644
index 0000000..2585b80
--- /dev/null
+++ b/tests/04-report.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite tests="2" failures="0" time="0.160" name="package/name">
+	<properties>
+		<property name="go.version" value="1.0"></property>
+	</properties>
+	<testcase classname="name" name="TestOne" time="0.060"></testcase>
+	<testcase classname="name" name="TestTwo" time="0.100"></testcase>
+</testsuite>