Skip to content

Commit ecc2b9f

Browse files
committed
Run ctime test in Linux MSan CI job
1 parent eb9646e commit ecc2b9f

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

.cirrus.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,11 @@ task:
328328
ECDH: yes
329329
RECOVERY: yes
330330
SCHNORRSIG: yes
331-
CTIMETEST: no
331+
CTIMETEST: yes
332332
CC: clang
333333
SECP256K1_TEST_ITERS: 32
334334
ASM: no
335+
WITH_VALGRIND: no
335336
container:
336337
memory: 2G
337338
matrix:

ci/cirrus.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ fi
6262
--enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \
6363
--enable-module-schnorrsig="$SCHNORRSIG" \
6464
--enable-examples="$EXAMPLES" \
65+
--enable-ctime-tests="$CTIMETEST" \
6566
--with-valgrind="$WITH_VALGRIND" \
6667
--host="$HOST" $EXTRAFLAGS
6768

@@ -78,14 +79,15 @@ export LOG_COMPILER="$WRAPPER_CMD"
7879

7980
make "$BUILD"
8081

82+
# Using the local `libtool` because on macOS the system's libtool has nothing to do with GNU libtool
83+
EXEC='./libtool --mode=execute'
84+
if [ -n "$WRAPPER_CMD" ]
85+
then
86+
EXEC="$EXEC $WRAPPER_CMD"
87+
fi
88+
8189
if [ "$BENCH" = "yes" ]
8290
then
83-
# Using the local `libtool` because on macOS the system's libtool has nothing to do with GNU libtool
84-
EXEC='./libtool --mode=execute'
85-
if [ -n "$WRAPPER_CMD" ]
86-
then
87-
EXEC="$EXEC $WRAPPER_CMD"
88-
fi
8991
{
9092
$EXEC ./bench_ecmult
9193
$EXEC ./bench_internal
@@ -95,7 +97,11 @@ fi
9597

9698
if [ "$CTIMETEST" = "yes" ]
9799
then
98-
./libtool --mode=execute valgrind --error-exitcode=42 ./ctime_tests > ctime_tests.log 2>&1
100+
if [ "$WITH_VALGRIND" = "yes" ]; then
101+
./libtool --mode=execute valgrind --error-exitcode=42 ./ctime_tests > ctime_tests.log 2>&1
102+
else
103+
$EXEC ./ctime_tests > ctime_tests.log 2>&1
104+
fi
99105
fi
100106

101107
# Rebuild precomputed files (if not cross-compiling).

0 commit comments

Comments
 (0)