diff --git a/ci/dash/test_integrationtests.sh b/ci/dash/test_integrationtests.sh index 095db8251f..c2b771820f 100755 --- a/ci/dash/test_integrationtests.sh +++ b/ci/dash/test_integrationtests.sh @@ -13,7 +13,7 @@ PASS_ARGS="$*" source ./ci/dash/matrix.sh -if [ "$RUN_INTEGRATION_TESTS" != "true" ]; then +if [ "$RUN_FUNCTIONAL_TESTS" != "true" ]; then echo "Skipping integration tests" exit 0 fi diff --git a/ci/test/00_setup_env.sh b/ci/test/00_setup_env.sh index c17ee4a360..4abb3ed769 100755 --- a/ci/test/00_setup_env.sh +++ b/ci/test/00_setup_env.sh @@ -38,7 +38,7 @@ export HOST=${HOST:-$("$BASE_ROOT_DIR/depends/config.guess")} export USE_BUSY_BOX=${USE_BUSY_BOX:-false} export RUN_UNIT_TESTS=${RUN_UNIT_TESTS:-true} -export RUN_INTEGRATION_TESTS=${RUN_INTEGRATION_TESTS:-true} +export RUN_FUNCTIONAL_TESTS=${RUN_FUNCTIONAL_TESTS:-true} export RUN_SECURITY_TESTS=${RUN_SECURITY_TESTS:-false} # By how much to scale the test_runner timeouts (option --timeout-factor). # This is needed because some ci machines have slow CPU or disk, so sanitizers diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh index 32a3532b87..62365f7d72 100755 --- a/ci/test/00_setup_env_arm.sh +++ b/ci/test/00_setup_env_arm.sh @@ -21,7 +21,7 @@ export CONTAINER_NAME=ci_arm_linux export CHECK_DOC=1 export USE_BUSY_BOX=true export RUN_UNIT_TESTS=false -export RUN_INTEGRATION_TESTS=false +export RUN_FUNCTIONAL_TESTS=false export GOAL="install" # -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1" # This could be removed once the ABI change warning does not show up by default diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index a460d6e577..0584376ee8 100755 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -12,6 +12,6 @@ export PACKAGES="cmake libcap-dev libz-dev libbz2-dev python3-setuptools" export XCODE_VERSION=12.2 export XCODE_BUILD_ID=12B45b export RUN_UNIT_TESTS=false -export RUN_INTEGRATION_TESTS=false +export RUN_FUNCTIONAL_TESTS=false export GOAL="all deploy" export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --disable-miner --enable-werror --with-boost-process" diff --git a/ci/test/00_setup_env_native_cxx20.sh b/ci/test/00_setup_env_native_cxx20.sh index 6d7405b2f2..3c795cbba3 100755 --- a/ci/test/00_setup_env_native_cxx20.sh +++ b/ci/test/00_setup_env_native_cxx20.sh @@ -11,7 +11,7 @@ export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libhar export DEP_OPTS="NO_UPNP=1 DEBUG=1" export CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG -DARENA_DEBUG" export PYZMQ=true -export RUN_INTEGRATION_TESTS=false +export RUN_FUNCTIONAL_TESTS=false export GOAL="install" export BITCOIN_CONFIG="--enable-zmq --enable-reduce-exports --enable-crash-hooks --enable-c++20 --enable-werror" diff --git a/ci/test/00_setup_env_native_fuzz.sh b/ci/test/00_setup_env_native_fuzz.sh index d826ad88f7..8a956aeda9 100755 --- a/ci/test/00_setup_env_native_fuzz.sh +++ b/ci/test/00_setup_env_native_fuzz.sh @@ -13,7 +13,7 @@ export CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG -DARENA_DEBUG" export CXXFLAGS="-Werror -Wno-unused-command-line-argument -Wno-unused-value -Wno-deprecated-builtins" export PYZMQ=true export RUN_UNIT_TESTS=false -export RUN_INTEGRATION_TESTS=false +export RUN_FUNCTIONAL_TESTS=false export RUN_FUZZ_TESTS=true export GOAL="install" export BITCOIN_CONFIG="--enable-zmq --disable-ccache --enable-fuzz --with-sanitizers=fuzzer,address,undefined --enable-suppress-external-warnings CC=clang-15 CXX=clang++-15 --with-boost-process" diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index f3879b406c..b1477d9b99 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -10,7 +10,7 @@ export CONTAINER_NAME=ci_win64 export HOST=x86_64-w64-mingw32 export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64" export DPKG_ADD_ARCH="i386" -export RUN_INTEGRATION_TESTS=false +export RUN_FUNCTIONAL_TESTS=false export RUN_SECURITY_TESTS="false" export GOAL="deploy" export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --without-boost-process"