diff --git a/contrib/teamcity/build-configurations.sh b/contrib/teamcity/build-configurations.sh --- a/contrib/teamcity/build-configurations.sh +++ b/contrib/teamcity/build-configurations.sh @@ -59,7 +59,7 @@ case "$ABC_BUILD_NAME" in build-asan) # Build with the address sanitizer, then run unit tests and functional tests. - CONFIGURE_FLAGS="--enable-debug --with-sanitizers=address --disable-ccache" "${CI_SCRIPTS_DIR}"/build.sh + CONFIGURE_FLAGS="--enable-debug --with-sanitizers=address --disable-ccache" "${CI_SCRIPTS_DIR}"/build_autotools.sh make -j "${THREADS}" check # FIXME Remove when wallet_multiwallet works with asan after backporting at least the following PRs from Core and their dependencies: 13161, 12493, 14320, 14552, 14760, 11911. TEST_RUNNER_FLAGS="${TEST_RUNNER_FLAGS} --exclude=wallet_multiwallet" @@ -68,7 +68,7 @@ build-ubsan) # Build with the undefined sanitizer, then run unit tests and functional tests. - CONFIGURE_FLAGS="--enable-debug --with-sanitizers=undefined --disable-ccache CC=clang CXX=clang++" "${CI_SCRIPTS_DIR}"/build.sh + CONFIGURE_FLAGS="--enable-debug --with-sanitizers=undefined --disable-ccache CC=clang CXX=clang++" "${CI_SCRIPTS_DIR}"/build_autotools.sh make -j "${THREADS}" check # FIXME Remove when abc-p2p-compactblocks works with ubsan. TEST_RUNNER_FLAGS="${TEST_RUNNER_FLAGS} --exclude=abc-p2p-compactblocks" @@ -77,7 +77,7 @@ build-tsan) # Build with the thread sanitizer, then run unit tests and functional tests. - CONFIGURE_FLAGS="--enable-debug --with-sanitizers=thread --disable-ccache CC=clang CXX=clang++" "${CI_SCRIPTS_DIR}"/build.sh + CONFIGURE_FLAGS="--enable-debug --with-sanitizers=thread --disable-ccache CC=clang CXX=clang++" "${CI_SCRIPTS_DIR}"/build_autotools.sh make -j "${THREADS}" check # FIXME Remove when wallet_multiwallet works with tsan after backporting at least the following PRs from Core and their dependencies: 13161, 12493, 14320, 14552, 14760, 11911. TEST_RUNNER_FLAGS="${TEST_RUNNER_FLAGS} --exclude=wallet_multiwallet" @@ -86,7 +86,7 @@ build-default) # Build, run unit tests and functional tests (all extended tests if this is the master branch). - "${CI_SCRIPTS_DIR}"/build.sh + "${CI_SCRIPTS_DIR}"/build_autotools.sh make -j "${THREADS}" check BRANCH=$(git rev-parse --abbrev-ref HEAD) @@ -100,29 +100,29 @@ export TOPLEVEL="${TOPLEVEL}"/src/secp256k1 export BUILD_DIR="${TOPLEVEL}"/build setup - CONFIGURE_FLAGS="--enable-jni --enable-experimental --enable-module-ecdh" "${CI_SCRIPTS_DIR}"/build.sh + CONFIGURE_FLAGS="--enable-jni --enable-experimental --enable-module-ecdh" "${CI_SCRIPTS_DIR}"/build_autotools.sh make -j "${THREADS}" check-java ;; build-without-wallet) # Build without wallet and run the unit tests. - CONFIGURE_FLAGS="--disable-wallet" "${CI_SCRIPTS_DIR}"/build.sh + CONFIGURE_FLAGS="--disable-wallet" "${CI_SCRIPTS_DIR}"/build_autotools.sh make -j "${THREADS}" check ;; build-ibd) - "${CI_SCRIPTS_DIR}"/build.sh + "${CI_SCRIPTS_DIR}"/build_autotools.sh "${CI_SCRIPTS_DIR}"/ibd.sh -disablewallet -debug=net ;; build-ibd-no-assumevalid-checkpoint) - "${CI_SCRIPTS_DIR}"/build.sh + "${CI_SCRIPTS_DIR}"/build_autotools.sh "${CI_SCRIPTS_DIR}"/ibd.sh -disablewallet -assumevalid=0 -checkpoints=0 -debug=net ;; build-werror) # Build with variable-length-array and thread-safety-analysis treated as errors - CONFIGURE_FLAGS="--enable-debug --enable-werror CC=clang CXX=clang++" "${CI_SCRIPTS_DIR}"/build.sh + CONFIGURE_FLAGS="--enable-debug --enable-werror CC=clang CXX=clang++" "${CI_SCRIPTS_DIR}"/build_autotools.sh ;; *) diff --git a/contrib/teamcity/build.sh b/contrib/teamcity/build_autotools.sh rename from contrib/teamcity/build.sh rename to contrib/teamcity/build_autotools.sh