File tree Expand file tree Collapse file tree 7 files changed +3
-482
lines changed Expand file tree Collapse file tree 7 files changed +3
-482
lines changed Original file line number Diff line number Diff line change @@ -415,9 +415,6 @@ functions:
415415 ${PREPARE_SHELL}
416416 SWIFT_VERSION=${SWIFT_VERSION} \
417417 bash ${PROJECT_DIRECTORY}/.evergreen/install-tools.sh sourcery
418- make linuxmain SOURCERY=${PROJECT_DIRECTORY}/opt/sourcery/bin/sourcery
419- # use regex to ignore lines starting with a /
420- git diff -G "^[^\/].*\n" --exit-code Tests/LinuxMain.swift
421418 make exports SOURCERY=${PROJECT_DIRECTORY}/opt/sourcery/bin/sourcery
422419 git diff -G "^[^\/].*\n" --exit-code Sources/MongoSwiftSync/Exports.swift
423420
Original file line number Diff line number Diff line change @@ -36,4 +36,4 @@ swift build
3636set +o errexit # even if tests fail we want to parse the results, so disable errexit
3737set -o pipefail # propagate error codes in the following pipes
3838
39- swift test --filter=OCSP
39+ swift test --enable-test-discovery -- filter=OCSP
Original file line number Diff line number Diff line change @@ -31,4 +31,4 @@ MONGODB_TOPOLOGY="load_balanced" \
3131 MONGODB_SCRAM_PASSWORD=${SERVERLESS_ATLAS_PASSWORD} \
3232 AUTH=" auth" \
3333 SSL=" ssl" \
34- swift test --filter=" (Crud|Retryable|Transactions|Versioned|Session|LoadBalancer|MongoCursor)"
34+ swift test --enable-test-discovery -- filter=" (Crud|Retryable|Transactions|Versioned|Session|LoadBalancer|MongoCursor)"
Original file line number Diff line number Diff line change 5454
5555MONGODB_TOPOLOGY=${TOPOLOGY} MONGODB_URI=$MONGODB_URI SINGLE_MONGOS_LB_URI=$SINGLE_MONGOS_LB_URI \
5656MULTI_MONGOS_LB_URI=$MULTI_MONGOS_LB_URI MONGODB_API_VERSION=$MONGODB_API_VERSION \
57- swift test $FILTER_STATEMENT $SANITIZE_STATEMENT 2>&1 | tee ${RAW_TEST_RESULTS}
57+ swift test --enable-test-discovery $FILTER_STATEMENT $SANITIZE_STATEMENT 2>&1 | tee ${RAW_TEST_RESULTS}
5858
5959# save tests exit code
6060EXIT_CODE=$?
Original file line number Diff line number Diff line change @@ -28,9 +28,6 @@ project:
2828 @$(call check_for_gem,xcodeproj)
2929 ruby etc/add_json_files.rb
3030
31- linuxmain :
32- $(SOURCERY ) --sources Tests/ --exclude-sources Tests/DisabledTests/ --templates Tests/LinuxMain.stencil --output Tests/LinuxMain.swift
33-
3431exports :
3532 $(SOURCERY ) --sources Sources/MongoSwift/ --templates Sources/MongoSwiftSync/Exports.stencil --output Sources/MongoSwiftSync/Exports.swift
3633
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments