Skip to content

Commit 1a0c8af

Browse files
committed
minor: run macos CI tests single-threaded
1 parent 5c3144b commit 1a0c8af

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

.evergreen/config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ functions:
127127
export SSL="${SSL}"
128128
. .evergreen/generate-uri.sh
129129
130-
ASYNC_RUNTIME=${ASYNC_RUNTIME} .evergreen/run-tests.sh
130+
SINGLE_THREAD=${SINGLE_THREAD} ASYNC_RUNTIME=${ASYNC_RUNTIME} .evergreen/run-tests.sh
131131
132132
"run atlas tests":
133133
- command: shell.exec
@@ -428,6 +428,8 @@ axes:
428428
- id: macos-10.14
429429
display_name: "MacOS 10.14"
430430
run_on: macos-1014
431+
variables:
432+
SINGLE_THREAD: true
431433

432434
buildvariants:
433435
-

.evergreen/run-async-std-tests.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
set -o errexit
44

55
. ~/.cargo/env
6-
RUST_BACKTRACE=1 cargo test --no-default-features --features async-std-runtime
7-
RUST_BACKTRACE=1 cargo test sync --no-default-features --features sync
8-
RUST_BACKTRACE=1 cargo test --doc sync --no-default-features --features sync
6+
7+
if [ "$SINGLE_THREAD" = true ]; then
8+
OPTIONS="-- --test-threads=1"
9+
fi
10+
11+
echo "cargo test options: ${OPTIONS}"
12+
13+
RUST_BACKTRACE=1 cargo test --no-default-features --features async-std-runtime $OPTIONS
14+
RUST_BACKTRACE=1 cargo test sync --no-default-features --features sync $OPTIONS
15+
RUST_BACKTRACE=1 cargo test --doc sync --no-default-features --features sync $OPTIONS

.evergreen/run-tokio-tests.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,11 @@
33
set -o errexit
44

55
. ~/.cargo/env
6-
RUST_BACKTRACE=1 cargo test
6+
7+
if [ "$SINGLE_THREAD" = true ]; then
8+
OPTIONS="-- --test-threads=1"
9+
fi
10+
11+
echo "cargo test options: ${OPTIONS}"
12+
13+
RUST_BACKTRACE=1 cargo test $OPTIONS

0 commit comments

Comments
 (0)