diff options
author | sergey.galtsev <sergey.galtsev@mongodb.com> | 2022-05-27 01:36:52 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-05-27 02:01:55 +0000 |
commit | db54aff64ffd7f87788206cb6258ffd91934104c (patch) | |
tree | 424da8757a54a19fbdd0fa060330c56dcc08d6ce /evergreen | |
parent | 12075d9eef3b143c3177effc58a1bea33a522204 (diff) | |
download | mongo-db54aff64ffd7f87788206cb6258ffd91934104c.tar.gz |
SERVER-66771 Rename CSFLE build artifacts
Diffstat (limited to 'evergreen')
-rwxr-xr-x | evergreen/crypt_run_tests.sh | 83 | ||||
-rwxr-xr-x | evergreen/csfle_run_tests.sh | 83 | ||||
-rw-r--r-- | evergreen/notary_client_crypt_run.sh (renamed from evergreen/notary_client_csfle_run.sh) | 4 |
3 files changed, 85 insertions, 85 deletions
diff --git a/evergreen/crypt_run_tests.sh b/evergreen/crypt_run_tests.sh new file mode 100755 index 00000000000..6a20341c27e --- /dev/null +++ b/evergreen/crypt_run_tests.sh @@ -0,0 +1,83 @@ +#!/bin/bash + +# This script verifies that specific symbols, and specific symbols only are +# exported in mongo_crypt_v1.so + +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" +. "$DIR/prelude.sh" + +cd src + +set -o errexit +set -o verbose + +if [ "$(uname)" != "Linux" ]; then + echo "Skipping test, this is for linux only" + exit 0 +fi + +EXTRACT_DIR="build/crypt-lib-${version}" +SOPATH="${EXTRACT_DIR}/lib/mongo_crypt_v1.so" +UNITTEST_PATH="${EXTRACT_DIR}/bin/mongo_crypt_shlib_test" +GDB_PATH="/opt/mongodbtoolchain/v3/bin/gdb" + +# dump the contents of the extract dir to log +find $EXTRACT_DIR + +if [ ! -f "$SOPATH" ]; then + echo "Error: can not find library at: $SOPATH" + exit 1 +fi + +# +# Check the set of exported symbols match the expected set of symbols +# +echo "Running Mongo Crypt Shared Library exported symbols test" + +expect='A MONGO_CRYPT_1.0 +T mongo_crypt_v1_analyze_query +T mongo_crypt_v1_bson_free +T mongo_crypt_v1_get_version +T mongo_crypt_v1_get_version_str +T mongo_crypt_v1_lib_create +T mongo_crypt_v1_lib_destroy +T mongo_crypt_v1_query_analyzer_create +T mongo_crypt_v1_query_analyzer_destroy +T mongo_crypt_v1_status_create +T mongo_crypt_v1_status_destroy +T mongo_crypt_v1_status_get_code +T mongo_crypt_v1_status_get_error +T mongo_crypt_v1_status_get_explanation' + +actual="$(nm --extern-only --defined-only "$SOPATH" | awk '{ print $2, $3 }' | sort)" + +if [ "$actual" != "$expect" ]; then + echo "Error: symbols are not as expected in: $SOPATH" + echo "Diff:" + diff <(echo "$actual") <(echo "$expect") + exit 1 +fi + +echo "Mongo Crypt Shared Library exported symbols test succeeded!" + +# +# If the shared library version of the unit tests exists, run it, +# and the verify it can be debugged with gdb +# +if [ ! -f "$UNITTEST_PATH" ]; then + echo "Skipping Mongo Crypt Shared Library unit test. Test not found at $UNITTEST_PATH" + exit 0 +fi + +echo "Running Mongo Crypt Shared Library unit test" +$UNITTEST_PATH +echo "Mongo Crypt Shared Library unit test succeeded!" + +if [ ! -f "$GDB_PATH" ]; then + echo "Skipping Mongo Crypt Shared Library debuggability test. No gdb found at $GDB_PATH" + exit 0 +fi + +echo "Running Mongo Crypt Shared Library debuggability test" +$GDB_PATH "$UNITTEST_PATH" --batch -ex "source ${EXTRACT_DIR}/crypt_debuggability_test.py" +echo "Mongo Crypt Shared Library shared library debuggability test succeeded!" diff --git a/evergreen/csfle_run_tests.sh b/evergreen/csfle_run_tests.sh deleted file mode 100755 index b4639a5c3c5..00000000000 --- a/evergreen/csfle_run_tests.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# This script verifies that specific symbols, and specific symbols only are -# exported in mongo_csfle_v1.so - -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" -. "$DIR/prelude.sh" - -cd src - -set -o errexit -set -o verbose - -if [ "$(uname)" != "Linux" ]; then - echo "Skipping test, this is for linux only" - exit 0 -fi - -EXTRACT_DIR="build/csfle-lib-${version}" -SOPATH="${EXTRACT_DIR}/lib/mongo_csfle_v1.so" -UNITTEST_PATH="${EXTRACT_DIR}/bin/mongo_csfle_shlib_test" -GDB_PATH="/opt/mongodbtoolchain/v3/bin/gdb" - -# dump the contents of the extract dir to log -find $EXTRACT_DIR - -if [ ! -f "$SOPATH" ]; then - echo "Error: can not find library at: $SOPATH" - exit 1 -fi - -# -# Check the set of exported symbols match the expected set of symbols -# -echo "Running CSFLE exported symbols test" - -expect='A MONGO_CSFLE_1.0 -T mongo_csfle_v1_analyze_query -T mongo_csfle_v1_bson_free -T mongo_csfle_v1_get_version -T mongo_csfle_v1_get_version_str -T mongo_csfle_v1_lib_create -T mongo_csfle_v1_lib_destroy -T mongo_csfle_v1_query_analyzer_create -T mongo_csfle_v1_query_analyzer_destroy -T mongo_csfle_v1_status_create -T mongo_csfle_v1_status_destroy -T mongo_csfle_v1_status_get_code -T mongo_csfle_v1_status_get_error -T mongo_csfle_v1_status_get_explanation' - -actual="$(nm --extern-only --defined-only "$SOPATH" | awk '{ print $2, $3 }' | sort)" - -if [ "$actual" != "$expect" ]; then - echo "Error: symbols are not as expected in: $SOPATH" - echo "Diff:" - diff <(echo "$actual") <(echo "$expect") - exit 1 -fi - -echo "CSFLE exported symbols test succeeded!" - -# -# If the shared library version of the unit tests exists, run it, -# and the verify it can be debugged with gdb -# -if [ ! -f "$UNITTEST_PATH" ]; then - echo "Skipping CSFLE shared library unit test. Test not found at $UNITTEST_PATH" - exit 0 -fi - -echo "Running CSFLE shared library unit test" -$UNITTEST_PATH -echo "CSFLE shared library unit test succeeded!" - -if [ ! -f "$GDB_PATH" ]; then - echo "Skipping CSFLE debuggability test. No gdb found at $GDB_PATH" - exit 0 -fi - -echo "Running CSFLE shared library debuggability test" -$GDB_PATH "$UNITTEST_PATH" --batch -ex "source ${EXTRACT_DIR}/csfle_debuggability_test.py" -echo "CSFLE shared library debuggability test succeeded!" diff --git a/evergreen/notary_client_csfle_run.sh b/evergreen/notary_client_crypt_run.sh index caa8305c604..6e4cd2221d1 100644 --- a/evergreen/notary_client_csfle_run.sh +++ b/evergreen/notary_client_crypt_run.sh @@ -10,11 +10,11 @@ set -o verbose ext="${ext:-tgz}" -mv "mongo_csfle_v1.$ext" mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext} +mv "mongo_crypt_v1.$ext" mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext} /usr/local/bin/notary-client.py \ --key-name "server-6.0" \ --auth-token-file ${workdir}/src/signing_auth_token \ --comment "Evergreen Automatic Signing ${revision} - ${build_variant} - ${branch_name}" \ --notary-url http://notary-service.build.10gen.cc:5000 \ - mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext} + mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext} |