Fix Android shared library tests
libpki.so moved and I forgot to upload this script.
Change-Id: I920c1bd506f7e3848a47729cb70ecf72402e0b49
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/61345
Reviewed-by: Adam Langley <agl@google.com>
Auto-Submit: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Commit-Queue: Adam Langley <agl@google.com>
diff --git a/util/run_android_tests.go b/util/run_android_tests.go
index 84297a9..6c793d2 100644
--- a/util/run_android_tests.go
+++ b/util/run_android_tests.go
@@ -313,16 +313,16 @@
err := filepath.Walk("pki/testdata/", func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
- }
+ }
if info.Mode().IsRegular() {
- files = append(files, path)
- }
- return nil
- })
- if err != nil {
+ files = append(files, path)
+ }
+ return nil
+ })
+ if err != nil {
fmt.Printf("Can't walk pki/testdata: %s\n", err)
- os.Exit(1);
- }
+ os.Exit(1)
+ }
tests, err := testconfig.ParseTestConfig("util/all_tests.json")
if err != nil {
@@ -385,10 +385,10 @@
if _, err := os.Stat(filepath.Join(*buildDir, "crypto/libcrypto.so")); err == nil {
libraries = []string{
"libboringssl_gtest.so",
+ "libpki.so",
"crypto/libcrypto.so",
"decrepit/libdecrepit.so",
"ssl/libssl.so",
- "pki/libpki.so",
}
} else if !os.IsNotExist(err) {
fmt.Printf("Failed to stat crypto/libcrypto.so: %s\n", err)
