diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-04-20 15:09:02 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-04-20 15:09:02 -0700 |
| commit | 247d0035411345d962435cf0f5ff965fd889632b (patch) | |
| tree | 6dbb5194f13d89300fd17300b9dae9dd880a97f0 /tools/run_tests | |
| parent | c807ddd5ddf2eb84ac98ab2332580a20fc0614cd (diff) | |
| parent | 2a52203af9099e0328f95abc923153d3e219ba2e (diff) | |
Merge pull request #6232 from itessier/master
Update boringssl to latest chromium-stable.
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/sanity/check_submodules.sh | 2 | ||||
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 27 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 24 |
3 files changed, 51 insertions, 2 deletions
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 06e66f0929..3349d28cf9 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -41,7 +41,7 @@ want_submodules=`mktemp /tmp/submXXXXXX` git submodule | awk '{ print $1 }' | sort > $submodules cat << EOF | awk '{ print $1 }' | sort > $want_submodules - 907ae62b9d81121cb86b604f83e6b811a43f7a87 third_party/boringssl (version_for_cocoapods_1.0-72-g907ae62) + c880e42ba1c8032d4cdde2aba0541d8a9d9fa2e9 third_party/boringssl (heads/2661) 05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f) c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0) f8ac463766281625ad710900479130c7fcb4d63b third_party/nanopb (nanopb-0.3.4-29-gf8ac463) diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 7978f12d53..64b71fdba7 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -3209,6 +3209,19 @@ { "deps": [ "boringssl", + "boringssl_test_util", + "boringssl_x509_test_lib" + ], + "headers": [], + "language": "c++", + "name": "boringssl_x509_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", "boringssl_tab_test_lib", "boringssl_test_util" ], @@ -4544,12 +4557,12 @@ "third_party/boringssl/crypto/cipher/internal.h", "third_party/boringssl/crypto/conf/conf_def.h", "third_party/boringssl/crypto/conf/internal.h", + "third_party/boringssl/crypto/curve25519/internal.h", "third_party/boringssl/crypto/des/internal.h", "third_party/boringssl/crypto/dh/internal.h", "third_party/boringssl/crypto/digest/internal.h", "third_party/boringssl/crypto/digest/md32_common.h", "third_party/boringssl/crypto/directory.h", - "third_party/boringssl/crypto/dsa/internal.h", "third_party/boringssl/crypto/ec/internal.h", "third_party/boringssl/crypto/ec/p256-x86_64-table.h", "third_party/boringssl/crypto/evp/internal.h", @@ -5062,6 +5075,18 @@ "boringssl_test_util" ], "headers": [], + "language": "c++", + "name": "boringssl_x509_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], "language": "c", "name": "boringssl_tab_test_lib", "src": [], diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 21f36eb995..ffd9b9d4c2 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -4256,6 +4256,30 @@ ], "flaky": false, "language": "c++", + "name": "boringssl_x509_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "args": [], + "boringssl": true, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "defaults": "boringssl", + "exclude_configs": [ + "asan" + ], + "flaky": false, + "language": "c++", "name": "boringssl_tab_test", "platforms": [ "linux", |