From 168f68b3ebaa55ce276cf3a58c9f9b82f747a635 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter@wuille.net>
Date: Tue, 28 Sep 2021 15:09:50 -0400
Subject: [PATCH] Add ellsq testing to CI

---
 .cirrus.yml  | 15 ++++++++++++---
 ci/cirrus.sh |  6 +++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7c83483e90..3eb44ba6f4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -18,6 +18,7 @@ env:
   ECDH: no
   RECOVERY: no
   SCHNORRSIG: no
+  ELLSQ: no
   ### test options
   TEST_ITERS:
   BENCH: yes
@@ -60,12 +61,12 @@ task:
     memory: 1G
   matrix: &ENV_MATRIX
     - env: {WIDEMUL:  int64,  RECOVERY: yes}
-    - env: {WIDEMUL:  int64,                 ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes}
+    - env: {WIDEMUL:  int64,                 ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes, ELLSQ: yes}
     - env: {WIDEMUL: int128}
-    - env: {WIDEMUL: int128,  RECOVERY: yes,            EXPERIMENTAL: yes, SCHNORRSIG: yes}
+    - env: {WIDEMUL: int128,  RECOVERY: yes,            EXPERIMENTAL: yes, SCHNORRSIG: yes, ELLSQ: yes}
     - env: {WIDEMUL: int128,                 ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes}
     - env: {WIDEMUL: int128,  ASM: x86_64}
-    - env: {                  RECOVERY: yes,            EXPERIMENTAL: yes, SCHNORRSIG: yes}
+    - env: {                  RECOVERY: yes,            EXPERIMENTAL: yes, SCHNORRSIG: yes, ELLSQ: yes}
     - env: {                  STATICPRECOMPUTATION: no}
     - env: {BUILD: distcheck, WITH_VALGRIND: no, CTIMETEST: no, BENCH: no}
     - env: {CPPFLAGS: -DDETERMINISTIC}
@@ -91,6 +92,7 @@ task:
   env:
     HOST: i686-linux-gnu
     ECDH: yes
+    ELLSQ: yes
     RECOVERY: yes
     EXPERIMENTAL: yes
     SCHNORRSIG: yes
@@ -175,6 +177,7 @@ task:
     HOST: s390x-linux-gnu
     WITH_VALGRIND: no
     ECDH: yes
+    ELLSQ: yes
     RECOVERY: yes
     EXPERIMENTAL: yes
     SCHNORRSIG: yes
@@ -198,6 +201,7 @@ task:
     HOST: arm-linux-gnueabihf
     WITH_VALGRIND: no
     ECDH: yes
+    ELLSQ: tes
     RECOVERY: yes
     EXPERIMENTAL: yes
     SCHNORRSIG: yes
@@ -222,6 +226,7 @@ task:
     HOST: aarch64-linux-gnu
     WITH_VALGRIND: no
     ECDH: yes
+    ELLSQ: yes
     RECOVERY: yes
     EXPERIMENTAL: yes
     SCHNORRSIG: yes
@@ -243,6 +248,7 @@ task:
     HOST: powerpc64le-linux-gnu
     WITH_VALGRIND: no
     ECDH: yes
+    ELLSQ: yes
     RECOVERY: yes
     EXPERIMENTAL: yes
     SCHNORRSIG: yes
@@ -264,6 +270,7 @@ task:
     HOST: x86_64-w64-mingw32
     WITH_VALGRIND: no
     ECDH: yes
+    ELLSQ: yes
     RECOVERY: yes
     EXPERIMENTAL: yes
     SCHNORRSIG: yes
@@ -281,6 +288,7 @@ task:
     memory: 2G
   env:
     ECDH: yes
+    ELLSQ: yes
     RECOVERY: yes
     EXPERIMENTAL: yes
     SCHNORRSIG: yes
@@ -334,6 +342,7 @@ task:
     WERROR_CFLAGS:
     EXPERIMENTAL: yes
     ECDH: yes
+    ELLSQ: yes
     RECOVERY: yes
     SCHNORRSIG: yes
   << : *MERGE_BASE
diff --git a/ci/cirrus.sh b/ci/cirrus.sh
index 27db1e6779..61352f228e 100755
--- a/ci/cirrus.sh
+++ b/ci/cirrus.sh
@@ -16,7 +16,7 @@ valgrind --version || true
     --enable-experimental="$EXPERIMENTAL" \
     --with-test-override-wide-multiply="$WIDEMUL" --with-asm="$ASM" \
     --enable-ecmult-static-precomputation="$STATICPRECOMPUTATION" --with-ecmult-gen-precision="$ECMULTGENPRECISION" \
-    --enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" \
+    --enable-module-ecdh="$ECDH" --enable-module-recovery="$RECOVERY" --enable-module-ellsq="$ELLSQ" \
     --enable-module-schnorrsig="$SCHNORRSIG" \
     --with-valgrind="$WITH_VALGRIND" \
     --host="$HOST" $EXTRAFLAGS
@@ -60,6 +60,10 @@ then
     then
         $EXEC ./bench_ecdh >> bench.log 2>&1
     fi
+    if [ "$ELLSQ" = "yes" ]
+    then
+        $EXEC ./bench_ellsq >> bench.log 2>&1
+    fi
     if [ "$SCHNORRSIG" = "yes" ]
     then
         $EXEC ./bench_schnorrsig >> bench.log 2>&1