kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make runner's -test parameter take glob patterns.

Browse Source 
Per request from EKR. Also we have a lot of long test names, so this
seems generally a good idea.

Change-Id: Ie463f5367ec7d33005137534836005b571c8f424
Reviewed-on: https://boringssl-review.googlesource.com/9021
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2016-07-28 18:04:43 -04:00 committed by Adam Langley
parent 4497e58961
commit 17e1292fe4
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ssl/test/runner/runner.go
View File

@ -31,6 +31,7 @@ import (
"os"
"os/exec"
"path"
"path/filepath"
"runtime"
"strconv"
"strings"
@ -48,7 +49,7 @@ var (
mallocTestDebug = flag.Bool("malloc-test-debug", false, "If true, ask bssl_shim 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.")
jsonOutput = flag.String("json-output", "", "The file to output JSON results to.")
pipe = flag.Bool("pipe", false, "If true, print status output suitable for piping into another program.")
testToRun = flag.String("test", "", "The name of a test to run, or empty to run all tests")
testToRun = flag.String("test", "", "The pattern to filter tests to run, or empty to run all tests")
numWorkers = flag.Int("num-workers", runtime.NumCPU(), "The number of workers to run in parallel.")
shimPath = flag.String("shim-path", "../../../build/ssl/test/bssl_shim", "The location of the shim binary.")
resourceDir = flag.String("resource-dir", ".", "The directory in which to find certificate and key files.")
@ -7828,13 +7829,24 @@ func main() {
var foundTest bool
for i := range testCases {
if len(*testToRun) == 0 || *testToRun == testCases[i].name {
matched := true
if len(*testToRun) != 0 {
var err error
matched, err = filepath.Match(*testToRun, testCases[i].name)
if err != nil {
fmt.Fprintf(os.Stderr, "Error matching pattern: %s\n", err)
os.Exit(1)
}
}
if matched {
foundTest = true
testChan <- &testCases[i]
}
}
if !foundTest {
fmt.Fprintf(os.Stderr, "No test named '%s'\n", *testToRun)
fmt.Fprintf(os.Stderr, "No tests matched %q\n", *testToRun)
os.Exit(1)
}