Skip RSATest.DISABLED_BlindingCacheConcurrency in SDE.
The SDE bot has started developing flakes with that many threads.
(Unclear if it is due to SDE or running too many copies of the test
in parallel.)
Change-Id: I0081b6d75882b946bdccee5405dc688d0035d565
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/40066
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/util/run_android_tests.go b/util/run_android_tests.go
index b2ad913..5eae742 100644
--- a/util/run_android_tests.go
+++ b/util/run_android_tests.go
@@ -17,7 +17,6 @@
import (
"bufio"
"bytes"
- "encoding/json"
"errors"
"flag"
"fmt"
@@ -29,6 +28,8 @@
"runtime"
"strconv"
"strings"
+
+ "boringssl.googlesource.com/boringssl/util/testconfig"
)
var (
@@ -244,37 +245,6 @@
return nil
}
-type test struct {
- args []string
- env []string
-}
-
-func parseTestConfig(filename string) ([]test, error) {
- in, err := os.Open(filename)
- if err != nil {
- return nil, err
- }
- defer in.Close()
-
- decoder := json.NewDecoder(in)
- var result [][]string
- if err := decoder.Decode(&result); err != nil {
- return nil, err
- }
-
- tests := make([]test, 0, len(result))
- for _, args := range result {
- var env []string
- for len(args) > 0 && strings.HasPrefix(args[0], "$") {
- env = append(env, args[0][1:])
- args = args[1:]
- }
- tests = append(tests, test{args: args, env: env})
- }
-
- return tests, nil
-}
-
func copyFile(dst, src string) error {
srcFile, err := os.Open(src)
if err != nil {
@@ -338,7 +308,7 @@
"BUILDING.md",
)
- tests, err := parseTestConfig("util/all_tests.json")
+ tests, err := testconfig.ParseTestConfig("util/all_tests.json")
if err != nil {
fmt.Printf("Failed to parse input: %s\n", err)
os.Exit(1)
@@ -346,11 +316,11 @@
seenBinary := make(map[string]struct{})
for _, test := range tests {
- if _, ok := seenBinary[test.args[0]]; !ok {
- binaries = append(binaries, test.args[0])
- seenBinary[test.args[0]] = struct{}{}
+ if _, ok := seenBinary[test.Cmd[0]]; !ok {
+ binaries = append(binaries, test.Cmd[0])
+ seenBinary[test.Cmd[0]] = struct{}{}
}
- for _, arg := range test.args[1:] {
+ for _, arg := range test.Cmd[1:] {
if strings.Contains(arg, "/") {
files = append(files, arg)
}
