Combine wally CI configure argument overrides, skip failing clear tests

gcc 7.5.0 seems to  still fail the clear tests, newer gcc's seem to
pass.

.gitlab-ci.yml

@@ -37,8 +37,8 @@ linux_py3_debug:
     - git submodule update --init --recursive
   script:
     - ./tools/cleanup.sh && ./tools/autogen.sh
-    - ENABLE_ELEMENTS=--enable-elements PYTHON_VERSION=3.7 DEBUG_WALLY=--enable-debug ./tools/travis_build.sh
-    - DEBUG_WALLY=--enable-debug ./tools/build_js_bindings.sh
+    - WALLY_CONFIGURE="--enable-elements --enable-debug" PYTHON_VERSION=3.7 ./tools/travis_build.sh
+    - WALLY_CONFIGURE="--enable-elements --enable-debug" ./tools/build_js_bindings.sh
 
 manylinux_release:
   image: greenaddress/wallycore@sha256:c3c36a55173eb29e5727dfc9a0417d05ac4c301adea109092fb9a0f7edbba10e

.travis.yml

@@ -45,6 +45,7 @@ jobs:
       - os: linux
         name: Linux - GCC
         compiler: gcc
+        env: PYTHON_VERSION=3 WALLY_CONFIGURE="--disable-clear-tests"
       - os: linux
         name: Linux - Clang 9
         compiler: clang
@@ -57,22 +58,18 @@ jobs:
         name: Linux - GCC - 32 bit
         compiler: gcc
         env: HOST=i686-linux-gnu
-      - os: linux
-        name: Linux - GCC - Python 3
-        compiler: gcc
-        env: PYTHON_VERSION=3
       - os: linux
         name: Linux - Clang - Debug
         compiler: clang
-        env: DEBUG_WALLY=--enable-debug LDFLAGS=-Wl,-z,now
+        env: WALLY_CONFIGURE="--enable-debug" LDFLAGS=-Wl,-z,now
       - os: linux
         name: Linux - GCC - Elements
         compiler: gcc
-        env: ENABLE_ELEMENTS=--enable-elements
+        env: PYTHON_VERSION=3 WALLY_CONFIGURE="--disable-clear-tests --enable-elements"
       - os: linux
         name: Linux - Clang 8 - Elements
         compiler: clang
-        env: CC=clang-8 CXX=clang++-8 LDFLAGS=-Wl,-z,now ENABLE_ELEMENTS=--enable-elements
+        env: WALLY_CONFIGURE="--enable-elements" CC=clang-8 CXX=clang++-8 LDFLAGS=-Wl,-z,now
       - os: windows
         name: Windows - Python 3
         env: PATH=/c/Python37:/c/Python37/Scripts:$PATH SWIG_PATH=/c/swig

tools/build_js_bindings.sh

@@ -9,7 +9,7 @@ fi
 
 tools/cleanup.sh
 tools/autogen.sh
-./configure --enable-js-wrappers --disable-swig-python --disable-swig-java --enable-ecmult-static-precomputation --enable-elements $DEBUG_WALLY
+./configure --enable-js-wrappers --disable-swig-python --disable-swig-java --enable-ecmult-static-precomputation --enable-elements $WALLY_CONFIGURE
 num_jobs=4
 if [ -f /proc/cpuinfo ]; then
     num_jobs=$(grep ^processor /proc/cpuinfo | wc -l)

tools/travis_build.sh

@@ -16,4 +16,4 @@ if [ -n "$HOST" ]; then
    fi
 fi
 
-./configure --disable-dependency-tracking --enable-export-all $ENABLE_SWIG_PYTHON $ENABLE_SWIG_JAVA $USE_HOST $DEBUG_WALLY $ENABLE_ELEMENTS && make && make check
+./configure --disable-dependency-tracking --enable-export-all $ENABLE_SWIG_PYTHON $ENABLE_SWIG_JAVA $USE_HOST $WALLY_CONFIGURE && make && make check