Skip to content

Commit

Permalink
Merge bitcoin#1947: [Travis] Set stricter timeout for Dash 32bit job
Browse files Browse the repository at this point in the history
c80cba7 Revert "hack to prevent travis no outputs timeouts" (Fuzzbawls)
875a2d7 [Travis] Set stricter timeout for Dash 32bit job (Fuzzbawls)

Pull request description:

  The unit tests for this job take upwards of 35 minutes due to 32-bit
  performance restrictions, so set a stricter build timeout.

  A build timeout of 600 seconds (10 minutes) was chosen as it is roughly double what a (currently) fully ccache'd build requires, so some leeway is left over to avoid unnecessary job restarts when a PR's changeset has a minimal impact on the build time.

  Additionally, revert the workaround "hack" to continuously output `.`'s to the console when running the unit tests as bitcoin#1944's reordering to run longer tests towards the beginning of the process has made it unnecessary. This also restores the easier to read output formatting.

ACKs for top commit:
  random-zebra:
    ACK c80cba7 and merging...

Tree-SHA512: 8c286660072064166573d017e4cde7e55830328d2badc377ecaafc33207e6dc7b11fcb63e0d1ec52e06c71510c998bdc4762a28bd50bda31712d20f2e87ce78b
  • Loading branch information
random-zebra committed Oct 29, 2020
2 parents de5b240 + c80cba7 commit 1fd7a25
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ jobs:
GOAL="install"
BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --disable-online-rust --with-params-dir=$PARAMS_DIR LDFLAGS=-static-libstdc++"
CONFIG_SHELL="/bin/dash"
BUILD_TIMEOUT=600
- stage: test
name: 'x86_64 Linux [GOAL: install] [bionic] [uses qt5 dev package instead of depends Qt to speed up build and avoid timeout]'
Expand Down
6 changes: 2 additions & 4 deletions src/Makefile.test.include
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,8 @@ check-zerocoin: $(ZEROCOIN_TESTS:.cpp=.cpp.test)
check-local: check-sapling check-zerocoin check-standard

%.cpp.test: %.cpp
@echo "" && echo Running tests: `cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1` from $<
$(AM_V_at)$(TEST_BINARY) -l test_suite -t "`cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1`" > $<.log 2>&1 || (cat $<.log && false) & echo "$$!" > "$<.pid"
@while kill -0 `cat $<.pid` > /dev/null 2>&1; do echo -n "." >&2 | sleep 0.5; done
@echo -e "\r\033[1A\033[0K" | rm $<.pid
@echo Running tests: `cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1` from $<
$(AM_V_at)$(TEST_BINARY) -l test_suite -t "`cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1`" > $<.log 2>&1 || (cat $<.log && false)

%.json.h: %.json
@$(MKDIR_P) $(@D)
Expand Down

0 comments on commit 1fd7a25

Please sign in to comment.