Skip to content

Commit

Permalink
Update travis tests
Browse files Browse the repository at this point in the history
  • Loading branch information
prasannavl committed May 7, 2020
1 parent fee796a commit 47b2388
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 22 deletions.
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_amd64_asan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ export HOST=x86_64-unknown-linux-gnu
export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev"
export NO_DEPENDS=1
export GOAL="install"
export DEFI_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=address,integer,undefined CC=clang CXX=clang++"
export DEFI_CONFIG="--enable-zmq --without-gui --with-incompatible-bdb CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=address,integer,undefined CC=clang CXX=clang++"
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_amd64_fuzz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export RUN_UNIT_TESTS=false
export RUN_FUNCTIONAL_TESTS=false
export RUN_FUZZ_TESTS=true
export GOAL="install"
export DEFI_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,address CC=clang CXX=clang++"
export DEFI_CONFIG="--enable-fuzz --without-gui --with-sanitizers=fuzzer,address CC=clang CXX=clang++"
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_amd64_nowallet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ export HOST=x86_64-unknown-linux-gnu
export PACKAGES="python3-zmq"
export DEP_OPTS="NO_WALLET=1"
export GOAL="install"
export DEFI_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
export DEFI_CONFIG="--enable-glibc-back-compat --enable-reduce-exports --without-gui"
14 changes: 0 additions & 14 deletions ci/test/00_setup_env_amd64_qt5.sh

This file was deleted.

2 changes: 1 addition & 1 deletion ci/test/00_setup_env_amd64_tsan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ export DOCKER_NAME_TAG=ubuntu:16.04
export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev"
export NO_DEPENDS=1
export GOAL="install"
export DEFI_CONFIG="--enable-zmq --disable-wallet --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=thread --disable-hardening --disable-asm CC=clang CXX=clang++"
export DEFI_CONFIG="--enable-zmq --disable-wallet --without-gui CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=thread --disable-hardening --disable-asm CC=clang CXX=clang++"
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_arm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ 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
export DEFI_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi"
export DEFI_CONFIG="--enable-glibc-back-compat --without-gui --enable-reduce-exports CXXFLAGS=-Wno-psabi"
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_i686.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export LC_ALL=C.UTF-8
export HOST=i686-pc-linux-gnu
export PACKAGES="g++-multilib python3-zmq"
export GOAL="install"
export DEFI_CONFIG="--enable-zmq --with-gui=qt5 --disable-bip70 --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++"
export DEFI_CONFIG="--enable-zmq --without-gui --disable-bip70 --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++"
export CONFIG_SHELL="/bin/dash"
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ export OSX_SDK=10.11
export RUN_UNIT_TESTS=false
export RUN_FUNCTIONAL_TESTS=false
export GOAL="deploy"
export DEFI_CONFIG="--enable-gui --enable-reduce-exports --enable-werror"
export DEFI_CONFIG="--without-gui --enable-reduce-exports --enable-werror"
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_win64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ export HOST=x86_64-w64-mingw32
export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64"
export RUN_FUNCTIONAL_TESTS=false
export GOAL="deploy"
export DEFI_CONFIG="--enable-reduce-exports --disable-gui-tests"
export DEFI_CONFIG="--enable-reduce-exports --without-gui"
2 changes: 2 additions & 0 deletions ci/test/06_script_a.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ END_FOLD
BEGIN_FOLD distdir
DOCKER_EXEC make distdir VERSION=$HOST
DOCKER_EXEC cp -r ../src/spv/bcash ../src/spv/bitcoin ../src/spv/support ../src/spv/Makefile "defi-$HOST/src/spv/"
DOCKER_EXEC cp -r ../share "defi-$HOST/"
DOCKER_EXEC cp -r ../contrib "defi-$HOST/"
END_FOLD

cd "defi-$HOST" || (echo "could not enter distdir defi-$HOST"; exit 1)
Expand Down

0 comments on commit 47b2388

Please sign in to comment.