diff options
| author | Andrei Vagin <avagin@gmail.com> | 2020-03-03 15:53:48 -0800 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2020-03-04 12:52:13 -0800 |
| commit | 504c9e14d61a9ca9fa3615290a05471684019ecc (patch) | |
| tree | 43e45ed82ed1f515ccd9026c82cb91fa8f1d4c8f /test/runner | |
| parent | 844e4d284cddf9795a0db7c38f926fe7b49bb873 (diff) | |
test/runner: use proper filters for test cases
The benchmark_filter options accepts regex-s, but
the gtest-filter option accepts shell-like wildcards.
Fixes #2034
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Diffstat (limited to 'test/runner')
| -rw-r--r-- | test/runner/gtest/gtest.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/runner/gtest/gtest.go b/test/runner/gtest/gtest.go index f96e2415e..869169ad5 100644 --- a/test/runner/gtest/gtest.go +++ b/test/runner/gtest/gtest.go @@ -66,13 +66,12 @@ func (tc TestCase) Args() []string { } if tc.benchmark { return []string{ - fmt.Sprintf("%s=^$", filterTestFlag), fmt.Sprintf("%s=^%s$", filterBenchmarkFlag, tc.Name), + fmt.Sprintf("%s=", filterTestFlag), } } return []string{ - fmt.Sprintf("%s=^%s$", filterTestFlag, tc.FullName()), - fmt.Sprintf("%s=^$", filterBenchmarkFlag), + fmt.Sprintf("%s=%s", filterTestFlag, tc.FullName()), } } @@ -147,6 +146,8 @@ func ParseTestCases(testBin string, benchmarks bool, extraArgs ...string) ([]Tes return nil, fmt.Errorf("could not enumerate gtest benchmarks: %v\nstderr\n%s", err, exitErr.Stderr) } + out = []byte(strings.Trim(string(out), "\n")) + // Parse benchmark output. for _, line := range strings.Split(string(out), "\n") { // Strip comments. |