Skip to content

Commit 8ab946b

Browse files
committed
fix crypt_shared handling
1 parent 5f27c26 commit 8ab946b

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

etc/run-mongodb-aws-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ set -o errexit # Exit the script with error if any of the commands fail
1313

1414
echo "Running MONGODB-AWS authentication tests"
1515

16-
if [ $1 == "ec2" ] && [ ${SKIP_EC2_AUTH_TEST:-} == "true" ]; then
16+
if [ "$1" == "ec2" ] && [ "${SKIP_EC2_AUTH_TEST:-}" == "true" ]; then
1717
echo "This platform does not support the EC2 auth test, skipping..."
1818
exit 0
1919
fi
2020

21-
if [ $1 == "web-identity" ] && [ ${SKIP_WEB_IDENTITY_AUTH_TEST:-} == "true" ]; then
21+
if [ "$1" == "web-identity" ] && [ "${SKIP_WEB_IDENTITY_AUTH_TEST:-}" == "true" ]; then
2222
echo "This platform does not support the EC2 auth test, skipping..."
2323
exit 0
2424
fi

etc/setup-test.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ if [[ "${GO_BUILD_TAGS}" =~ cse ]]; then
6565
LD_LIBRARY_PATH=$(pwd)/install/libmongocrypt/lib64
6666

6767
if [ "$(uname -s)" = "Darwin" ]; then
68-
PKG_CONFIG_PATH=$(pwd)/install/libmongocrypt/lib/pkgconfig
69-
DYLD_FALLBACK_LIBRARY_PATH=$(pwd)/install/libmongocrypt/lib
68+
PKG_CONFIG_PATH=$(pwd)/install/libmongocrypt/lib/pkgconfig
69+
DYLD_FALLBACK_LIBRARY_PATH=$(pwd)/install/libmongocrypt/lib
7070
fi
7171

7272
if [ "${SKIP_CRYPT_SHARED_LIB:-''}" = "true" ]; then
@@ -76,7 +76,12 @@ if [[ "${GO_BUILD_TAGS}" =~ cse ]]; then
7676
# Find the crypt_shared library file in the current directory and set the CRYPT_SHARED_LIB_PATH to
7777
# the path of that file. Only look for .so, .dll, or .dylib files to prevent matching any other
7878
# downloaded files.
79-
CRYPT_SHARED_LIB_PATH="$(find "$(pwd)" -maxdepth 1 -type f \
79+
if [ "Windows_NT" = "$OS" ]; then
80+
BASE_PATH="c:/libmongocrypt"
81+
else
82+
BASE_PATH="$(pwd)/install"
83+
fi
84+
CRYPT_SHARED_LIB_PATH="$(find "$BASE_PATH" -maxdepth 1 -type f \
8085
-name 'mongo_crypt_v1.so' -o \
8186
-name 'mongo_crypt_v1.dll' -o \
8287
-name 'mongo_crypt_v1.dylib')"

0 commit comments

Comments
 (0)