diff options
author | David Benjamin <davidben@google.com> | 2024-02-28 13:15:53 -0500 |
---|---|---|
committer | Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-03-04 22:36:49 +0000 |
commit | 1e8461cc151960ad941ee7dd0e0bb13337e3c556 (patch) | |
tree | 95a7ff65e03a8dcb7d6aa7ed0b47b6c820a51f23 /util | |
parent | df3b58ea74c50ff785ab902be3b007ff008d3e3c (diff) | |
download | boringssl-1e8461cc151960ad941ee7dd0e0bb13337e3c556.zip boringssl-1e8461cc151960ad941ee7dd0e0bb13337e3c556.tar.gz boringssl-1e8461cc151960ad941ee7dd0e0bb13337e3c556.tar.bz2 |
runner: Use go:embed
This removes the need to ship the PEM files with the built runner.
Instead we can use go:embed to pick up the key files. We do, annoyingly,
need to write the Channel ID file to a temporary, but it's not a huge
deal. When/if we rework all this to JSON, we can avoid this.
Change-Id: Ie0d187a5396546dc157906430639c26b3cc59ca2
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/66627
Reviewed-by: Bob Beck <bbe@google.com>
Auto-Submit: David Benjamin <davidben@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
Diffstat (limited to 'util')
-rw-r--r-- | util/run_android_tests.go | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/util/run_android_tests.go b/util/run_android_tests.go index acc5c6b..79bcfe8 100644 --- a/util/run_android_tests.go +++ b/util/run_android_tests.go @@ -352,19 +352,6 @@ func main() { if enableSSLTests() { binaries = append(binaries, "ssl/test/bssl_shim") - files = append(files, - "BUILDING.md", - "ssl/test/runner/channel_id_key.pem", - "ssl/test/runner/ecdsa_p224_key.pem", - "ssl/test/runner/ecdsa_p256_key.pem", - "ssl/test/runner/ecdsa_p384_key.pem", - "ssl/test/runner/ecdsa_p521_key.pem", - "ssl/test/runner/ed25519_key.pem", - "ssl/test/runner/rsa_2048_key.pem", - "ssl/test/runner/rsa_1024_key.pem", - "util/all_tests.json", - ) - fmt.Printf("Building runner...\n") if err := goTool("test", "-c", "-o", filepath.Join(tmpDir, "ssl/test/runner/runner"), "./ssl/test/runner/"); err != nil { fmt.Printf("Error building runner: %s\n", err) |