Skip to content

Commit 8e1d36a

Browse files
committed
Run ctime test in Linux MSan CI job
1 parent ab8cc92 commit 8e1d36a

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
@@ -327,10 +327,11 @@ task:
327327
ECDH: yes
328328
RECOVERY: yes
329329
SCHNORRSIG: yes
330-
CTIMETEST: no
330+
CTIMETEST: yes
331331
CC: clang
332332
SECP256K1_TEST_ITERS: 32
333333
ASM: no
334+
WITH_VALGRIND: no
334335
container:
335336
memory: 2G
336337
matrix:

ci/cirrus.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ fi
5757
--enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \
5858
--enable-module-schnorrsig="$SCHNORRSIG" \
5959
--enable-examples="$EXAMPLES" \
60+
--enable-ctime-tests="$CTIMETEST" \
6061
--with-valgrind="$WITH_VALGRIND" \
6162
--host="$HOST" $EXTRAFLAGS
6263

@@ -73,14 +74,15 @@ export LOG_COMPILER="$WRAPPER_CMD"
7374

7475
make "$BUILD"
7576

77+
# Using the local `libtool` because on macOS the system's libtool has nothing to do with GNU libtool
78+
EXEC='./libtool --mode=execute'
79+
if [ -n "$WRAPPER_CMD" ]
80+
then
81+
EXEC="$EXEC $WRAPPER_CMD"
82+
fi
83+
7684
if [ "$BENCH" = "yes" ]
7785
then
78-
# Using the local `libtool` because on macOS the system's libtool has nothing to do with GNU libtool
79-
EXEC='./libtool --mode=execute'
80-
if [ -n "$WRAPPER_CMD" ]
81-
then
82-
EXEC="$EXEC $WRAPPER_CMD"
83-
fi
8486
{
8587
$EXEC ./bench_ecmult
8688
$EXEC ./bench_internal
@@ -90,7 +92,11 @@ fi
9092

9193
if [ "$CTIMETEST" = "yes" ]
9294
then
93-
./libtool --mode=execute valgrind --error-exitcode=42 ./ctime_tests > ctime_tests.log 2>&1
95+
if [ "$WITH_VALGRIND" = "yes" ]; then
96+
./libtool --mode=execute valgrind --error-exitcode=42 ./ctime_tests > ctime_tests.log 2>&1
97+
else
98+
$EXEC ./ctime_tests > ctime_tests.log 2>&1
99+
fi
94100
fi
95101

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

0 commit comments

Comments
 (0)