enable passing a glob for jUnit XML

Author: leonid-shevtsov

junit.go

@@ -5,6 +5,8 @@ import (
 	"io"
 	"os"
 	"path"
+
+	"github.com/bmatcuk/doublestar"
 )
 
 type junitXML struct {
@@ -26,23 +28,31 @@ func loadJUnitXML(reader io.Reader) *junitXML {
 	return &junitXML
 }
 
+func addFileTimesFromIOReader(fileTimes map[string]float64, reader io.Reader) {
+	junitXML := loadJUnitXML(reader)
+	for _, testCase := range junitXML.TestCases {
+		filePath := path.Clean(testCase.File)
+		fileTimes[filePath] += testCase.Time
+	}
+}
+
 func getFileTimesFromJUnitXML(fileTimes map[string]float64) {
-	var source io.Reader
 	if junitXMLPath != "" {
-		file, err := os.Open(junitXMLPath)
+		filenames, err := doublestar.Glob(junitXMLPath)
 		if err != nil {
-			fatalMsg("failed to open junit xml: %v\n", err)
+			fatalMsg("failed to match jUnit filename pattern: %v", err)
+		}
+		for _, junitFilename := range filenames {
+			file, err := os.Open(junitFilename)
+			if err != nil {
+				fatalMsg("failed to open junit xml: %v\n", err)
+			}
+			printMsg("using test times from JUnit report %s\n", junitXMLPath)
+			addFileTimesFromIOReader(fileTimes, file)
+			file.Close()
 		}
-		defer file.Close()
-		printMsg("using test times from JUnit report %s\n", junitXMLPath)
-		source = file
 	} else {
 		printMsg("using test times from JUnit report at stdin\n")
-		source = os.Stdin
-	}
-	junitXML := loadJUnitXML(source)
-	for _, testCase := range junitXML.TestCases {
-		filePath := path.Clean(testCase.File)
-		fileTimes[filePath] += testCase.Time
+		addFileTimesFromIOReader(fileTimes, os.Stdin)
 	}
 }

split_tests.go main.gosplit_tests.go renamed to main.go

@@ -75,7 +75,7 @@ func parseFlags() {
 	flag.StringVar(&circleCIBranchName, "circleci-branch", "", "Current branch for CircleCI (or set CIRCLE_BRANCH) - required to use CircleCI")
 
 	flag.BoolVar(&useJUnitXML, "junit", false, "Use a JUnit XML report for test times")
-	flag.StringVar(&junitXMLPath, "junit-path", "", "Path to a JUnit XML report (leave empty to read from stdin)")
+	flag.StringVar(&junitXMLPath, "junit-path", "", "Path to a JUnit XML report (leave empty to read from stdin; use glob pattern to load multiple files)")
 
 	flag.BoolVar(&useLineCount, "line-count", false, "Use line count to estimate test times")