summaryrefslogtreecommitdiff
path: root/tests/interop
diff options
context:
space:
mode:
authorMartin Thomson <martin.thomson@gmail.com>2018-08-27 13:44:16 +1000
committerMartin Thomson <martin.thomson@gmail.com>2018-08-27 13:44:16 +1000
commit0624f6b3b5a83c80730cbccb03a3fbe6a7a1a4b7 (patch)
tree6f1c6f7b7a516585e7f564d20548cde964f43941 /tests/interop
parent3d2eb094dde31d386f6a63576ecaa68adddbadb3 (diff)
downloadnss-hg-0624f6b3b5a83c80730cbccb03a3fbe6a7a1a4b7.tar.gz
Bug 1483129 - Update interop tests, a=bustage
Diffstat (limited to 'tests/interop')
-rwxr-xr-xtests/interop/interop.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/interop/interop.sh b/tests/interop/interop.sh
index 6533ecce3..c4694c3e4 100755
--- a/tests/interop/interop.sh
+++ b/tests/interop/interop.sh
@@ -33,7 +33,7 @@ interop_init()
BORING=${BORING:=boringssl}
if [ ! -d "$BORING" ]; then
git clone -q https://boringssl.googlesource.com/boringssl "$BORING"
- git -C "$BORING" checkout -q 9af1edbe2201e6c6d58e5e484bf56281d8c751d9
+ git -C "$BORING" checkout -q 7f4f41fa81c03e0f8ef1ab5b3d1d566b5968f107
fi
BORING=$(cd "$BORING";pwd -P)
mkdir "$BORING/build"
@@ -51,7 +51,7 @@ interop_init()
OSSL=${OSSL:=openssl}
if [ ! -d "$OSSL" ]; then
git clone -q https://github.com/openssl/openssl.git "$OSSL"
- git -C "$OSSL" checkout -q 9e6a32025e6e69949ad3e53a29a0b85f61f30b85
+ git -C "$OSSL" checkout -q 7d38ca3f8bca58bf7b69e78c1f1ab69e5f429dff
fi
OSSL=$(cd "$OSSL";pwd -P)
cd "$OSSL"
@@ -92,6 +92,7 @@ interop_run()
html_msg $? 1 "Interop ${test_name}" "No failures"
}
+cd "$(dirname "$0")"
interop_init
NSS_SHIM="$BINDIR"/nss_bogo_shim
BORING_SHIM="$BORING"/build/ssl/test/bssl_shim