Skip to content

Commit a24a351

Browse files
laanwjMunkybooty
authored andcommitted
Merge bitcoin#14036: travis: Run unit tests --with-sanitizers=undefined
fad8afa travis: Run unit tests --with-sanitizers=undefined (MarcoFalke) 0d00fd5 depends: allow CC/CXX to be overridden during configure (Cory Fields) Pull request description: See issue bitcoin#12691 Tree-SHA512: 0772e8e037411cb4664270945a0fc9c0c1ed24eeaf5308460baee707868f7b700d8e740a6babb1d02bc818a8a4b71d9e33601ab2cc850ff315755fcf3d79d29e # Conflicts: # .travis.yml
1 parent eae3b9a commit a24a351

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

ci/matrix.sh

+8-13
Original file line numberDiff line numberDiff line change
@@ -31,64 +31,59 @@ export GOAL="install"
3131
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
3232
export MAKEJOBS="-j4"
3333

34-
export RUN_UNITTESTS=false
35-
export RUN_INTEGRATIONTESTS=false
34+
export RUN_UNITTESTS=true
35+
export RUN_INTEGRATIONTESTS=true
3636

3737
if [ "$BUILD_TARGET" = "arm-linux" ]; then
3838
export HOST=arm-linux-gnueabihf
3939
export CHECK_DOC=1
4040
# -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
4141
# This could be removed once the ABI change warning does not show up by default
4242
export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi"
43+
export RUN_UNITTESTS=false
44+
export RUN_INTEGRATIONTESTS=false
4345
elif [ "$BUILD_TARGET" = "win32" ]; then
4446
export HOST=i686-w64-mingw32
4547
export DPKG_ADD_ARCH="i386"
4648
export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner"
4749
export DIRECT_WINE_EXEC_TESTS=true
48-
export RUN_UNITTESTS=true
4950
elif [ "$BUILD_TARGET" = "win64" ]; then
5051
export HOST=x86_64-w64-mingw32
5152
export DPKG_ADD_ARCH="i386"
5253
export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner"
5354
export DIRECT_WINE_EXEC_TESTS=true
54-
export RUN_UNITTESTS=true
5555
elif [ "$BUILD_TARGET" = "linux32" ]; then
5656
export HOST=i686-pc-linux-gnu
5757
export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports --enable-crash-hooks LDFLAGS=-static-libstdc++"
5858
export USE_SHELL="/bin/dash"
5959
export PYZMQ=true
60-
export RUN_UNITTESTS=true
61-
export RUN_INTEGRATIONTESTS=true
6260
elif [ "$BUILD_TARGET" = "linux64" ]; then
6361
export HOST=x86_64-unknown-linux-gnu
6462
export DEP_OPTS="NO_UPNP=1 DEBUG=1"
6563
export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports --enable-crash-hooks"
6664
export CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG -DARENA_DEBUG"
6765
export PYZMQ=true
68-
export RUN_UNITTESTS=true
69-
export RUN_INTEGRATIONTESTS=true
7066
elif [ "$BUILD_TARGET" = "linux64_cxx17" ]; then
7167
export HOST=x86_64-unknown-linux-gnu
7268
export DEP_OPTS="NO_UPNP=1 DEBUG=1"
73-
export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports --enable-crash-hooks --enable-c++17"
69+
export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports --enable-crash-hooks --enable-c++17 --with-sanitizers=undefined"
7470
export CPPFLAGS="-DDEBUG_LOCKORDER -DENABLE_DASH_DEBUG -DARENA_DEBUG"
7571
export PYZMQ=true
76-
export RUN_UNITTESTS=true
77-
export RUN_INTEGRATIONTESTS=true
72+
export RUN_INTEGRATIONTESTS=false
7873
elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then
7974
export HOST=x86_64-unknown-linux-gnu
8075
export DEP_OPTS="NO_WALLET=1"
8176
export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
82-
export RUN_UNITTESTS=true
8377
elif [ "$BUILD_TARGET" = "linux64_release" ]; then
8478
export HOST=x86_64-unknown-linux-gnu
8579
export DEP_OPTS="NO_UPNP=1"
8680
export BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports"
8781
export PYZMQ=true
88-
export RUN_UNITTESTS=true
8982
elif [ "$BUILD_TARGET" = "mac" ]; then
9083
export HOST=x86_64-apple-darwin14
9184
export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner"
9285
export OSX_SDK=10.11
9386
export GOAL="all deploy"
87+
export RUN_UNITTESTS=false
88+
export RUN_INTEGRATIONTESTS=false
9489
fi

depends/config.site.in

+6-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,12 @@ export PKG_CONFIG_PATH=$depends_prefix/share/pkgconfig
5555
CPPFLAGS="-I$depends_prefix/include/ $CPPFLAGS"
5656
LDFLAGS="-L$depends_prefix/lib $LDFLAGS"
5757

58-
CC="@CC@"
59-
CXX="@CXX@"
60-
OBJC="${CC}"
58+
if test -n "@CC@" -a -z "${CC}"; then
59+
CC="@CC@"
60+
fi
61+
if test -n "@CXX@" -a -z "${CXX}"; then
62+
CXX="@CXX@"
63+
fi
6164
PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH
6265

6366
if test -n "@AR@"; then

0 commit comments

Comments
 (0)