From bafd626dff549341f385e0f98352296b445bb384 Mon Sep 17 00:00:00 2001
From: Simon Giesecke <sgiesecke@mozilla.com>
Date: Fri, 4 Sep 2020 10:23:37 +0200
Subject: [PATCH] Problem: coverage build script doesn't recognize several
 config options

Solution: extrace and reuse regular config option setting
---
 builds/coverage/ci_build.sh | 22 ++----------
 ci_build.sh                 | 67 ++---------------------------------
 config.sh                   | 69 +++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 84 deletions(-)
 create mode 100644 config.sh

diff --git a/builds/coverage/ci_build.sh b/builds/coverage/ci_build.sh
index 686e6ece..8896116a 100755
--- a/builds/coverage/ci_build.sh
+++ b/builds/coverage/ci_build.sh
@@ -5,27 +5,11 @@ set -x
 mkdir tmp
 BUILD_PREFIX=$PWD/tmp
 
-CONFIG_OPTS=()
-CONFIG_OPTS+=("CFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CXXFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
+source ../../config.sh
+set_config_opts
+
 CONFIG_OPTS+=("--enable-code-coverage")
 
-if [ -z $CURVE ]; then
-    CMAKE_OPTS+=("-DENABLE_CURVE=OFF")
-elif [ $CURVE == "libsodium" ]; then
-    CMAKE_OPTS+=("-DWITH_LIBSODIUM=ON")
-
-    if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
-            (command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
-        git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-        ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
-    fi
-fi
-
 pip install --user cpp-coveralls
 
 # Build, check, and install from local source
diff --git a/ci_build.sh b/ci_build.sh
index a426be3f..f9209444 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -7,71 +7,8 @@ if [ $BUILD_TYPE = "default" ]; then
     mkdir tmp
     BUILD_PREFIX=$PWD/tmp
 
-    CONFIG_OPTS=()
-    CONFIG_OPTS+=("CFLAGS=-g")
-    CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-    CONFIG_OPTS+=("CXXFLAGS=-g")
-    CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-    CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-    CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
-    CHECK="distcheck"
-
-    if [ -n "$ADDRESS_SANITIZER" ] && [ "$ADDRESS_SANITIZER" = "enabled" ]; then
-        CONFIG_OPTS+=("--enable-address-sanitizer=yes")
-        # distcheck does an out-of-tree build, and the fuzzer tests use a hard-coded relative path for simplicity
-        CHECK="check"
-        git clone --depth 1 https://github.com/zeromq/libzmq-fuzz-corpora.git tests/libzmq-fuzz-corpora
-    fi
-
-    if [ "$USE_NSS" = "yes" ]; then
-        CONFIG_OPTS+=("--with-nss")
-    fi
-
-    if [ -z "$CURVE" ]; then
-        CONFIG_OPTS+=("--disable-curve")
-    elif [ "$CURVE" = "libsodium" ]; then
-        CONFIG_OPTS+=("--with-libsodium=yes")
-
-        if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
-                (command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
-            git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-            ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
-        fi
-    fi
-
-    if [ -n "$GSSAPI" ] && [ "$GSSAPI" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-libgssapi_krb5=yes")
-    fi
-
-    if [ -n "$PGM" ] && [ "$PGM" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-pgm=yes")
-    fi
-
-    if [ -n "$NORM" ] && [ "$NORM" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-norm=yes")
-    fi
-
-    if [ -n "$TIPC" ] && [ "$TIPC" = "enabled" ]; then
-        sudo modprobe tipc
-    fi
-
-    if [ -n "$POLLER" ]; then
-        CONFIG_OPTS+=("--with-poller=${POLLER}")
-    fi
-
-    if [ -n "$TLS" ] && [ "$TLS" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-tls=yes")
-    fi
-
-    if [ -z "$DRAFT" ] || [ "$DRAFT" = "disabled" ]; then
-        CONFIG_OPTS+=("--enable-drafts=no")
-    elif [ "$DRAFT" = "enabled" ]; then
-        CONFIG_OPTS+=("--enable-drafts=yes")
-    fi
-
-    if [ -n "$FORCE_98" ] && [ "$FORCE_98" = "enabled" ]; then
-        CONFIG_OPTS+=("--enable-force-CXX98-compat=yes")
-    fi
+    source config.sh
+    set_config_opts
 
     # Build and check this project
     (
diff --git a/config.sh b/config.sh
new file mode 100644
index 00000000..4648cab4
--- /dev/null
+++ b/config.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+
+function set_config_opts() {
+    CONFIG_OPTS=()
+    CONFIG_OPTS+=("CFLAGS=-g")
+    CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
+    CONFIG_OPTS+=("CXXFLAGS=-g")
+    CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
+    CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
+    CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
+    CHECK="distcheck"
+
+    if [ -n "$ADDRESS_SANITIZER" ] && [ "$ADDRESS_SANITIZER" = "enabled" ]; then
+        CONFIG_OPTS+=("--enable-address-sanitizer=yes")
+        # distcheck does an out-of-tree build, and the fuzzer tests use a hard-coded relative path for simplicity
+        CHECK="check"
+        git clone --depth 1 https://github.com/zeromq/libzmq-fuzz-corpora.git tests/libzmq-fuzz-corpora
+    fi
+
+    if [ "$USE_NSS" = "yes" ]; then
+        CONFIG_OPTS+=("--with-nss")
+    fi
+
+    if [ -z "$CURVE" ]; then
+        CONFIG_OPTS+=("--disable-curve")
+    elif [ "$CURVE" = "libsodium" ]; then
+        CONFIG_OPTS+=("--with-libsodium=yes")
+
+        if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
+                (command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
+            git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
+            ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
+        fi
+    fi
+
+    if [ -n "$GSSAPI" ] && [ "$GSSAPI" = "enabled" ]; then
+        CONFIG_OPTS+=("--with-libgssapi_krb5=yes")
+    fi
+
+    if [ -n "$PGM" ] && [ "$PGM" = "enabled" ]; then
+        CONFIG_OPTS+=("--with-pgm=yes")
+    fi
+
+    if [ -n "$NORM" ] && [ "$NORM" = "enabled" ]; then
+        CONFIG_OPTS+=("--with-norm=yes")
+    fi
+
+    if [ -n "$TIPC" ] && [ "$TIPC" = "enabled" ]; then
+        sudo modprobe tipc
+    fi
+
+    if [ -n "$POLLER" ]; then
+        CONFIG_OPTS+=("--with-poller=${POLLER}")
+    fi
+
+    if [ -n "$TLS" ] && [ "$TLS" = "enabled" ]; then
+        CONFIG_OPTS+=("--with-tls=yes")
+    fi
+
+    if [ -z "$DRAFT" ] || [ "$DRAFT" = "disabled" ]; then
+        CONFIG_OPTS+=("--enable-drafts=no")
+    elif [ "$DRAFT" = "enabled" ]; then
+        CONFIG_OPTS+=("--enable-drafts=yes")
+    fi
+
+    if [ -n "$FORCE_98" ] && [ "$FORCE_98" = "enabled" ]; then
+        CONFIG_OPTS+=("--enable-force-CXX98-compat=yes")
+    fi
+}