Making all_tests.go parallelizable

Use -num-workers to run multiple workers in parallel when running tests.

Change-Id: Iee5554ee78ec8d77700a0df5a297bd2515d34dca
Reviewed-on: https://boringssl-review.googlesource.com/7285
Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
Steven Valdez 2016-03-02 11:53:07 -05:00 committed by David Benjamin
parent 9bea349660
commit 32223940f2

View File

@ -24,6 +24,7 @@ import (
"path" "path"
"strconv" "strconv"
"strings" "strings"
"sync"
"syscall" "syscall"
"time" "time"
) )
@ -34,6 +35,7 @@ var (
useValgrind = flag.Bool("valgrind", false, "If true, run code under valgrind") useValgrind = flag.Bool("valgrind", false, "If true, run code under valgrind")
useGDB = flag.Bool("gdb", false, "If true, run BoringSSL code under gdb") useGDB = flag.Bool("gdb", false, "If true, run BoringSSL code under gdb")
buildDir = flag.String("build-dir", "build", "The build directory to run the tests from.") buildDir = flag.String("build-dir", "build", "The build directory to run the tests from.")
numWorkers = flag.Int("num-workers", 1, "Runs the given number of workers when testing.")
jsonOutput = flag.String("json-output", "", "The file to output JSON results to.") jsonOutput = flag.String("json-output", "", "The file to output JSON results to.")
mallocTest = flag.Int64("malloc-test", -1, "If non-negative, run each test with each malloc in turn failing from the given number onwards.") mallocTest = flag.Int64("malloc-test", -1, "If non-negative, run each test with each malloc in turn failing from the given number onwards.")
mallocTestDebug = flag.Bool("malloc-test-debug", false, "If true, ask each test to abort rather than fail a malloc. This can be used with a specific value for --malloc-test to identity the malloc failing that is causing problems.") mallocTestDebug = flag.Bool("malloc-test-debug", false, "If true, ask each test to abort rather than fail a malloc. This can be used with a specific value for --malloc-test to identity the malloc failing that is causing problems.")
@ -41,6 +43,12 @@ var (
type test []string type test []string
type result struct {
Test test
Passed bool
Error error
}
// testOutput is a representation of Chromium's JSON test result format. See // testOutput is a representation of Chromium's JSON test result format. See
// https://www.chromium.org/developers/the-json-test-results-format // https://www.chromium.org/developers/the-json-test-results-format
type testOutput struct { type testOutput struct {
@ -225,28 +233,54 @@ func parseTestConfig(filename string) ([]test, error) {
return result, nil return result, nil
} }
func worker(tests <-chan test, results chan<- result, done *sync.WaitGroup) {
defer done.Done()
for test := range tests {
passed, err := runTest(test)
results <- result{test, passed, err}
}
}
func main() { func main() {
flag.Parse() flag.Parse()
setWorkingDirectory() setWorkingDirectory()
tests, err := parseTestConfig("util/all_tests.json") testCases, err := parseTestConfig("util/all_tests.json")
if err != nil { if err != nil {
fmt.Printf("Failed to parse input: %s\n", err) fmt.Printf("Failed to parse input: %s\n", err)
os.Exit(1) os.Exit(1)
} }
var wg sync.WaitGroup
tests := make(chan test, *numWorkers)
results := make(chan result, len(testCases))
for i := 0; i < *numWorkers; i++ {
go worker(tests, results, &wg)
}
for _, test := range testCases {
tests <- test
}
close(tests)
go func() {
wg.Wait()
close(results)
}()
testOutput := newTestOutput() testOutput := newTestOutput()
var failed []test var failed []test
for _, test := range tests { for testResult := range results {
fmt.Printf("%s\n", strings.Join([]string(test), " ")) test := testResult.Test
fmt.Printf("%s\n", strings.Join([]string(test), " "))
name := shortTestName(test) name := shortTestName(test)
passed, err := runTest(test) if testResult.Error != nil {
if err != nil { fmt.Printf("%s failed to complete: %s\n", test[0], testResult.Error)
fmt.Printf("%s failed to complete: %s\n", test[0], err)
failed = append(failed, test) failed = append(failed, test)
testOutput.addResult(name, "CRASHED") testOutput.addResult(name, "CRASHED")
} else if !passed { } else if !testResult.Passed {
fmt.Printf("%s failed to print PASS on the last line.\n", test[0]) fmt.Printf("%s failed to print PASS on the last line.\n", test[0])
failed = append(failed, test) failed = append(failed, test)
testOutput.addResult(name, "FAIL") testOutput.addResult(name, "FAIL")