aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests
diff options
context:
space:
mode:
authorGravatar kpayson64 <kpayson@google.com>2017-06-20 12:09:21 -0700
committerGravatar GitHub <noreply@github.com>2017-06-20 12:09:21 -0700
commit9cd18311a0806e8c8023e1e4aa0e8ed3124bc9ca (patch)
tree7aaa08555222ab47cd20d871dd08bc085d15f821 /tools/run_tests
parentcf8c67c00b040b69f0dd9d0e687d4115896123f8 (diff)
parentf8d6fb7a94f3ff57f01322f87c34a48667f124ae (diff)
Merge pull request #11412 from kpayson64/upgrade_boringssl
Upgrade boringssl
Diffstat (limited to 'tools/run_tests')
-rw-r--r--tools/run_tests/generated/sources_and_headers.json255
-rw-r--r--tools/run_tests/generated/tests.json256
-rwxr-xr-xtools/run_tests/sanity/check_submodules.sh2
3 files changed, 35 insertions, 478 deletions
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index ad142c5582..0c4e1fae1d 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -4175,20 +4175,6 @@
{
"deps": [
"boringssl",
- "boringssl_chacha_test_lib",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_chacha_test",
- "src": [],
- "third_party": true,
- "type": "target"
- },
- {
- "deps": [
- "boringssl",
"boringssl_aead_test_lib",
"boringssl_test_util"
],
@@ -4287,20 +4273,6 @@
{
"deps": [
"boringssl",
- "boringssl_dh_test_lib",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_dh_test",
- "src": [],
- "third_party": true,
- "type": "target"
- },
- {
- "deps": [
- "boringssl",
"boringssl_digest_test_lib",
"boringssl_test_util"
],
@@ -4315,27 +4287,13 @@
{
"deps": [
"boringssl",
- "boringssl_dsa_test_lib",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_dsa_test",
- "src": [],
- "third_party": true,
- "type": "target"
- },
- {
- "deps": [
- "boringssl",
- "boringssl_ec_test_lib",
+ "boringssl_example_mul_lib",
"boringssl_test_util"
],
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "boringssl_ec_test",
+ "name": "boringssl_example_mul",
"src": [],
"third_party": true,
"type": "target"
@@ -4343,13 +4301,13 @@
{
"deps": [
"boringssl",
- "boringssl_example_mul_lib",
+ "boringssl_p256-x86_64_test_lib",
"boringssl_test_util"
],
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "boringssl_example_mul",
+ "name": "boringssl_p256-x86_64_test",
"src": [],
"third_party": true,
"type": "target"
@@ -4413,20 +4371,6 @@
{
"deps": [
"boringssl",
- "boringssl_err_test_lib",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_err_test",
- "src": [],
- "third_party": true,
- "type": "target"
- },
- {
- "deps": [
- "boringssl",
"boringssl_evp_extra_test_lib",
"boringssl_test_util"
],
@@ -4525,48 +4469,6 @@
{
"deps": [
"boringssl",
- "boringssl_newhope_statistical_test_lib",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_newhope_statistical_test",
- "src": [],
- "third_party": true,
- "type": "target"
- },
- {
- "deps": [
- "boringssl",
- "boringssl_newhope_test_lib",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_newhope_test",
- "src": [],
- "third_party": true,
- "type": "target"
- },
- {
- "deps": [
- "boringssl",
- "boringssl_newhope_vectors_test_lib",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_newhope_vectors_test",
- "src": [],
- "third_party": true,
- "type": "target"
- },
- {
- "deps": [
- "boringssl",
"boringssl_obj_test_lib",
"boringssl_test_util"
],
@@ -4623,13 +4525,13 @@
{
"deps": [
"boringssl",
- "boringssl_refcount_test_lib",
+ "boringssl_pool_test_lib",
"boringssl_test_util"
],
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "boringssl_refcount_test",
+ "name": "boringssl_pool_test",
"src": [],
"third_party": true,
"type": "target"
@@ -4637,13 +4539,13 @@
{
"deps": [
"boringssl",
- "boringssl_rsa_test_lib",
+ "boringssl_refcount_test_lib",
"boringssl_test_util"
],
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "boringssl_rsa_test",
+ "name": "boringssl_refcount_test",
"src": [],
"third_party": true,
"type": "target"
@@ -4720,20 +4622,6 @@
},
{
"deps": [
- "boringssl",
- "boringssl_ssl_test_lib",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_ssl_test",
- "src": [],
- "third_party": true,
- "type": "target"
- },
- {
- "deps": [
"bad_client_test",
"gpr",
"gpr_test_util",
@@ -6565,14 +6453,14 @@
"third_party/boringssl/crypto/digest/md32_common.h",
"third_party/boringssl/crypto/ec/internal.h",
"third_party/boringssl/crypto/ec/p256-x86_64-table.h",
+ "third_party/boringssl/crypto/ec/p256-x86_64.h",
"third_party/boringssl/crypto/evp/internal.h",
"third_party/boringssl/crypto/internal.h",
"third_party/boringssl/crypto/modes/internal.h",
- "third_party/boringssl/crypto/newhope/internal.h",
"third_party/boringssl/crypto/obj/obj_dat.h",
- "third_party/boringssl/crypto/obj/obj_xref.h",
"third_party/boringssl/crypto/pkcs8/internal.h",
"third_party/boringssl/crypto/poly1305/internal.h",
+ "third_party/boringssl/crypto/pool/internal.h",
"third_party/boringssl/crypto/rand/internal.h",
"third_party/boringssl/crypto/rsa/internal.h",
"third_party/boringssl/crypto/x509/charmap.h",
@@ -6622,7 +6510,6 @@
"third_party/boringssl/include/openssl/md4.h",
"third_party/boringssl/include/openssl/md5.h",
"third_party/boringssl/include/openssl/mem.h",
- "third_party/boringssl/include/openssl/newhope.h",
"third_party/boringssl/include/openssl/nid.h",
"third_party/boringssl/include/openssl/obj.h",
"third_party/boringssl/include/openssl/obj_mac.h",
@@ -6635,6 +6522,7 @@
"third_party/boringssl/include/openssl/pkcs7.h",
"third_party/boringssl/include/openssl/pkcs8.h",
"third_party/boringssl/include/openssl/poly1305.h",
+ "third_party/boringssl/include/openssl/pool.h",
"third_party/boringssl/include/openssl/rand.h",
"third_party/boringssl/include/openssl/rc4.h",
"third_party/boringssl/include/openssl/ripemd.h",
@@ -6647,7 +6535,6 @@
"third_party/boringssl/include/openssl/stack.h",
"third_party/boringssl/include/openssl/stack_macros.h",
"third_party/boringssl/include/openssl/thread.h",
- "third_party/boringssl/include/openssl/time_support.h",
"third_party/boringssl/include/openssl/tls1.h",
"third_party/boringssl/include/openssl/type_check.h",
"third_party/boringssl/include/openssl/x509.h",
@@ -6760,19 +6647,6 @@
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "boringssl_chacha_test_lib",
- "src": [],
- "third_party": true,
- "type": "lib"
- },
- {
- "deps": [
- "boringssl",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
"name": "boringssl_aead_test_lib",
"src": [],
"third_party": true,
@@ -6811,7 +6685,7 @@
],
"headers": [],
"is_filegroup": false,
- "language": "c",
+ "language": "c++",
"name": "boringssl_constant_time_test_lib",
"src": [],
"third_party": true,
@@ -6864,19 +6738,6 @@
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "boringssl_dh_test_lib",
- "src": [],
- "third_party": true,
- "type": "lib"
- },
- {
- "deps": [
- "boringssl",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
"name": "boringssl_digest_test_lib",
"src": [],
"third_party": true,
@@ -6890,7 +6751,7 @@
"headers": [],
"is_filegroup": false,
"language": "c",
- "name": "boringssl_dsa_test_lib",
+ "name": "boringssl_example_mul_lib",
"src": [],
"third_party": true,
"type": "lib"
@@ -6903,20 +6764,7 @@
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "boringssl_ec_test_lib",
- "src": [],
- "third_party": true,
- "type": "lib"
- },
- {
- "deps": [
- "boringssl",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c",
- "name": "boringssl_example_mul_lib",
+ "name": "boringssl_p256-x86_64_test_lib",
"src": [],
"third_party": true,
"type": "lib"
@@ -6981,19 +6829,6 @@
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "boringssl_err_test_lib",
- "src": [],
- "third_party": true,
- "type": "lib"
- },
- {
- "deps": [
- "boringssl",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
"name": "boringssl_evp_extra_test_lib",
"src": [],
"third_party": true,
@@ -7032,7 +6867,7 @@
],
"headers": [],
"is_filegroup": false,
- "language": "c",
+ "language": "c++",
"name": "boringssl_hkdf_test_lib",
"src": [],
"third_party": true,
@@ -7058,7 +6893,7 @@
],
"headers": [],
"is_filegroup": false,
- "language": "c",
+ "language": "c++",
"name": "boringssl_lhash_test_lib",
"src": [],
"third_party": true,
@@ -7085,45 +6920,6 @@
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "boringssl_newhope_statistical_test_lib",
- "src": [],
- "third_party": true,
- "type": "lib"
- },
- {
- "deps": [
- "boringssl",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_newhope_test_lib",
- "src": [],
- "third_party": true,
- "type": "lib"
- },
- {
- "deps": [
- "boringssl",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_newhope_vectors_test_lib",
- "src": [],
- "third_party": true,
- "type": "lib"
- },
- {
- "deps": [
- "boringssl",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
"name": "boringssl_obj_test_lib",
"src": [],
"third_party": true,
@@ -7175,8 +6971,8 @@
],
"headers": [],
"is_filegroup": false,
- "language": "c",
- "name": "boringssl_refcount_test_lib",
+ "language": "c++",
+ "name": "boringssl_pool_test_lib",
"src": [],
"third_party": true,
"type": "lib"
@@ -7189,7 +6985,7 @@
"headers": [],
"is_filegroup": false,
"language": "c++",
- "name": "boringssl_rsa_test_lib",
+ "name": "boringssl_refcount_test_lib",
"src": [],
"third_party": true,
"type": "lib"
@@ -7260,19 +7056,6 @@
"type": "lib"
},
{
- "deps": [
- "boringssl",
- "boringssl_test_util"
- ],
- "headers": [],
- "is_filegroup": false,
- "language": "c++",
- "name": "boringssl_ssl_test_lib",
- "src": [],
- "third_party": true,
- "type": "lib"
- },
- {
"deps": [],
"headers": [
"third_party/benchmark/include/benchmark/benchmark.h",
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 22b124c7ca..8cca6d3daf 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -4230,7 +4230,9 @@
]
},
{
- "args": [],
+ "args": [
+ "third_party/boringssl/crypto/aes/aes_tests.txt"
+ ],
"boringssl": true,
"ci_platforms": [
"linux",
@@ -4382,31 +4384,6 @@
]
},
{
- "args": [],
- "boringssl": true,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "defaults": "boringssl",
- "exclude_configs": [
- "asan",
- "ubsan"
- ],
- "flaky": false,
- "language": "c++",
- "name": "boringssl_chacha_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ]
- },
- {
"args": [
"aes-128-gcm",
"third_party/boringssl/crypto/cipher/test/aes_128_gcm_tests.txt"
@@ -4436,34 +4413,6 @@
},
{
"args": [
- "aes-128-key-wrap",
- "third_party/boringssl/crypto/cipher/test/aes_128_key_wrap_tests.txt"
- ],
- "boringssl": true,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "defaults": "boringssl",
- "exclude_configs": [
- "asan",
- "ubsan"
- ],
- "flaky": false,
- "language": "c++",
- "name": "boringssl_aead_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ]
- },
- {
- "args": [
"aes-256-gcm",
"third_party/boringssl/crypto/cipher/test/aes_256_gcm_tests.txt"
],
@@ -4492,8 +4441,8 @@
},
{
"args": [
- "aes-256-key-wrap",
- "third_party/boringssl/crypto/cipher/test/aes_256_key_wrap_tests.txt"
+ "aes-128-gcm-siv",
+ "third_party/boringssl/crypto/cipher/test/aes_128_gcm_siv_tests.txt"
],
"boringssl": true,
"ci_platforms": [
@@ -4520,8 +4469,8 @@
},
{
"args": [
- "chacha20-poly1305",
- "third_party/boringssl/crypto/cipher/test/chacha20_poly1305_tests.txt"
+ "aes-256-gcm-siv",
+ "third_party/boringssl/crypto/cipher/test/aes_256_gcm_siv_tests.txt"
],
"boringssl": true,
"ci_platforms": [
@@ -4548,8 +4497,8 @@
},
{
"args": [
- "chacha20-poly1305-old",
- "third_party/boringssl/crypto/cipher/test/chacha20_poly1305_old_tests.txt"
+ "chacha20-poly1305",
+ "third_party/boringssl/crypto/cipher/test/chacha20_poly1305_tests.txt"
],
"boringssl": true,
"ci_platforms": [
@@ -5137,31 +5086,6 @@
],
"flaky": false,
"language": "c++",
- "name": "boringssl_dh_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ]
- },
- {
- "args": [],
- "boringssl": true,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "defaults": "boringssl",
- "exclude_configs": [
- "asan",
- "ubsan"
- ],
- "flaky": false,
- "language": "c++",
"name": "boringssl_digest_test",
"platforms": [
"linux",
@@ -5187,7 +5111,7 @@
],
"flaky": false,
"language": "c++",
- "name": "boringssl_dsa_test",
+ "name": "boringssl_example_mul",
"platforms": [
"linux",
"mac",
@@ -5196,32 +5120,9 @@
]
},
{
- "args": [],
- "boringssl": true,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "defaults": "boringssl",
- "exclude_configs": [
- "asan",
- "ubsan"
+ "args": [
+ "third_party/boringssl/crypto/ec/p256-x86_64_tests.txt"
],
- "flaky": false,
- "language": "c++",
- "name": "boringssl_ec_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ]
- },
- {
- "args": [],
"boringssl": true,
"ci_platforms": [
"linux",
@@ -5237,7 +5138,7 @@
],
"flaky": false,
"language": "c++",
- "name": "boringssl_example_mul",
+ "name": "boringssl_p256-x86_64_test",
"platforms": [
"linux",
"mac",
@@ -5368,31 +5269,6 @@
],
"flaky": false,
"language": "c++",
- "name": "boringssl_err_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ]
- },
- {
- "args": [],
- "boringssl": true,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "defaults": "boringssl",
- "exclude_configs": [
- "asan",
- "ubsan"
- ],
- "flaky": false,
- "language": "c++",
"name": "boringssl_evp_extra_test",
"platforms": [
"linux",
@@ -5572,83 +5448,6 @@
],
"flaky": false,
"language": "c++",
- "name": "boringssl_newhope_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ]
- },
- {
- "args": [],
- "boringssl": true,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "defaults": "boringssl",
- "exclude_configs": [
- "asan",
- "ubsan"
- ],
- "flaky": false,
- "language": "c++",
- "name": "boringssl_newhope_statistical_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ]
- },
- {
- "args": [
- "third_party/boringssl/crypto/newhope/newhope_tests.txt"
- ],
- "boringssl": true,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "defaults": "boringssl",
- "exclude_configs": [
- "asan",
- "ubsan"
- ],
- "flaky": false,
- "language": "c++",
- "name": "boringssl_newhope_vectors_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ]
- },
- {
- "args": [],
- "boringssl": true,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "defaults": "boringssl",
- "exclude_configs": [
- "asan",
- "ubsan"
- ],
- "flaky": false,
- "language": "c++",
"name": "boringssl_obj_test",
"platforms": [
"linux",
@@ -5751,7 +5550,7 @@
],
"flaky": false,
"language": "c++",
- "name": "boringssl_refcount_test",
+ "name": "boringssl_pool_test",
"platforms": [
"linux",
"mac",
@@ -5776,7 +5575,7 @@
],
"flaky": false,
"language": "c++",
- "name": "boringssl_rsa_test",
+ "name": "boringssl_refcount_test",
"platforms": [
"linux",
"mac",
@@ -5910,31 +5709,6 @@
]
},
{
- "args": [],
- "boringssl": true,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "defaults": "boringssl",
- "exclude_configs": [
- "asan",
- "ubsan"
- ],
- "flaky": false,
- "language": "c++",
- "name": "boringssl_ssl_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ]
- },
- {
"args": [
"authority_not_supported"
],
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index c95ef4fcd8..d856e22176 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -27,7 +27,7 @@ want_submodules=`mktemp /tmp/submXXXXXX`
git submodule | awk '{ print $1 }' | sort > $submodules
cat << EOF | awk '{ print $1 }' | sort > $want_submodules
44c25c892a6229b20db7cd9dc05584ea865896de third_party/benchmark (v0.1.0-343-g44c25c8)
- 78684e5b222645828ca302e56b40b9daff2b2d27 third_party/boringssl (78684e5)
+ be2ee342d3781ddb954f91f8a7e660c6f59e87e5 third_party/boringssl (heads/chromium-stable)
886e7d75368e3f4fab3f4d0d3584e4abfc557755 third_party/boringssl-with-bazel (version_for_cocoapods_7.0-857-g886e7d7)
30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0)
ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0)