diff options
author | Filippo Valsorda <filippo@golang.org> | 2018-06-29 13:16:42 -0400 |
---|---|---|
committer | Filippo Valsorda <filippo@golang.org> | 2018-07-03 15:17:00 -0400 |
commit | 77db076129160d50a098958c8e3f3fd5caa6257a (patch) | |
tree | 447493d9010d80a77353597dde156fb985680444 /src/crypto/rsa/boring_test.go | |
parent | b77f5e4c8530279d40eb29dc86a320a8fb4f909e (diff) | |
parent | 1a27f048ad25f151d2a17ce7f2d73d0d2dbe94cf (diff) | |
download | go-77db076129160d50a098958c8e3f3fd5caa6257a.tar.gz go-77db076129160d50a098958c8e3f3fd5caa6257a.zip |
[dev.boringcrypto] all: merge master into dev.boringcrypto
Add a couple of skips for slow js/wasm tests.
Change-Id: Ic95256b1d3c6e5e2f0cc536fad51e914d31cda9e
Diffstat (limited to 'src/crypto/rsa/boring_test.go')
-rw-r--r-- | src/crypto/rsa/boring_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/crypto/rsa/boring_test.go b/src/crypto/rsa/boring_test.go index f68dfc9999..26fdabb197 100644 --- a/src/crypto/rsa/boring_test.go +++ b/src/crypto/rsa/boring_test.go @@ -86,11 +86,11 @@ func TestBoringGenerateKey(t *testing.T) { } func TestBoringFinalizers(t *testing.T) { - if runtime.GOOS == "nacl" { - // Times out on nacl (without BoringCrypto) + if runtime.GOOS == "nacl" || runtime.GOOS == "js" { + // Times out on nacl and js/wasm (without BoringCrypto) // but not clear why - probably consuming rand.Reader too quickly // and being throttled. Also doesn't really matter. - t.Skip("skipping on nacl") + t.Skipf("skipping on %s/%s", runtime.GOOS, runtime.GOARCH) } k, err := GenerateKey(rand.Reader, 2048) |