Skip to content

Commit 592661c

Browse files
committed
ci: move test environment variable declaration to .cirrus.yml
environment var moved: 1. SECP256K1_TEST_ITERS (replaces TEST_ITERS) 2. SECP256K1_BENCH_ITERS (replaces BENCH_ITERS)
1 parent dcbe84b commit 592661c

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

.cirrus.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ env:
1919
RECOVERY: no
2020
SCHNORRSIG: no
2121
### test options
22-
TEST_ITERS:
22+
SECP256K1_TEST_ITERS:
2323
BENCH: yes
24-
BENCH_ITERS: 2
24+
SECP256K1_BENCH_ITERS: 2
2525
CTIMETEST: yes
2626

2727
cat_logs_snippet: &CAT_LOGS
@@ -171,7 +171,7 @@ task:
171171
memory: 1G
172172
env:
173173
WRAPPER_CMD: qemu-s390x
174-
TEST_ITERS: 16
174+
SECP256K1_TEST_ITERS: 16
175175
HOST: s390x-linux-gnu
176176
WITH_VALGRIND: no
177177
ECDH: yes
@@ -194,7 +194,7 @@ task:
194194
memory: 1G
195195
env:
196196
WRAPPER_CMD: qemu-arm
197-
TEST_ITERS: 16
197+
SECP256K1_TEST_ITERS: 16
198198
HOST: arm-linux-gnueabihf
199199
WITH_VALGRIND: no
200200
ECDH: yes
@@ -218,7 +218,7 @@ task:
218218
memory: 1G
219219
env:
220220
WRAPPER_CMD: qemu-aarch64
221-
TEST_ITERS: 16
221+
SECP256K1_TEST_ITERS: 16
222222
HOST: aarch64-linux-gnu
223223
WITH_VALGRIND: no
224224
ECDH: yes
@@ -239,7 +239,7 @@ task:
239239
memory: 1G
240240
env:
241241
WRAPPER_CMD: qemu-ppc64le
242-
TEST_ITERS: 16
242+
SECP256K1_TEST_ITERS: 16
243243
HOST: powerpc64le-linux-gnu
244244
WITH_VALGRIND: no
245245
ECDH: yes
@@ -260,7 +260,7 @@ task:
260260
memory: 1G
261261
env:
262262
WRAPPER_CMD: wine64-stable
263-
TEST_ITERS: 16
263+
SECP256K1_TEST_ITERS: 16
264264
HOST: x86_64-w64-mingw32
265265
WITH_VALGRIND: no
266266
ECDH: yes
@@ -290,15 +290,15 @@ task:
290290
env:
291291
# The `--error-exitcode` is required to make the test fail if valgrind found errors, otherwise it'll return 0 (https://www.valgrind.org/docs/manual/manual-core.html)
292292
WRAPPER_CMD: "valgrind --error-exitcode=42"
293-
TEST_ITERS: 16
293+
SECP256K1_TEST_ITERS: 16
294294
- name: "UBSan, ASan, LSan"
295295
env:
296296
CFLAGS: "-fsanitize=undefined,address"
297297
CFLAGS_FOR_BUILD: "-fsanitize=undefined,address"
298298
UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1"
299299
ASAN_OPTIONS: "strict_string_checks=1:detect_stack_use_after_return=1:detect_leaks=1"
300300
LSAN_OPTIONS: "use_unaligned=1"
301-
TEST_ITERS: 32
301+
SECP256K1_TEST_ITERS: 32
302302
# Try to cover many configurations with just a tiny matrix.
303303
matrix:
304304
- env:

ci/cirrus.sh

-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ file .libs/* || true
3232
# This tells `make check` to wrap test invocations.
3333
export LOG_COMPILER="$WRAPPER_CMD"
3434

35-
# This limits the iterations in the tests and benchmarks.
36-
export SECP256K1_TEST_ITERS="$TEST_ITERS"
37-
export SECP256K1_BENCH_ITERS="$BENCH_ITERS"
38-
3935
make "$BUILD"
4036

4137
if [ "$BENCH" = "yes" ]

0 commit comments

Comments
 (0)