Skip to content

Commit 10786fe

Browse files
codablockUdjinM6
authored andcommitted
Use travis_wait for "wine test_dash.exe" call to fix timeouts (#1812)
* Revert "Adjust tests to avoid Travis timeouts (#1745)" This reverts commit 32f2169. * Revert "Show test progress for tests running in wine to avoid Travis timeout (#1740)" This reverts commit 31bc9d4. * Use travis_wait when calling "wine test_dash.exe"
1 parent 4bce3bf commit 10786fe

File tree

4 files changed

+1
-6
lines changed

4 files changed

+1
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ script:
8383
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
8484
- export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
8585
- if [ "$RUN_TESTS" = "true" -a "$WINE" != "true" ]; then travis_wait 30 make $MAKEJOBS check VERBOSE=1; fi
86-
- if [ "$RUN_TESTS" = "true" -a "$WINE" = "true" ]; then wine src/test/test_dash.exe --log_level=test_suite; fi
86+
- if [ "$RUN_TESTS" = "true" -a "$WINE" = "true" ]; then travis_wait 30 wine src/test/test_dash.exe; fi
8787
- if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
8888
after_script:
8989
- echo $TRAVIS_COMMIT_RANGE

src/test/coins_tests.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ BOOST_AUTO_TEST_CASE(coins_cache_simulation_test)
190190

191191
// Once every 1000 iterations and at the end, verify the full cache.
192192
if (insecure_rand() % 1000 == 1 || i == NUM_SIMULATION_ITERATIONS - 1) {
193-
BOOST_TEST_MESSAGE("coins_cache_simulation_test - verifying full cache");
194193
for (auto it = result.begin(); it != result.end(); it++) {
195194
bool have = stack.back()->HaveCoin(it->first);
196195
const Coin& coin = stack.back()->AccessCoin(it->first);
@@ -422,7 +421,6 @@ BOOST_AUTO_TEST_CASE(updatecoins_simulation_test)
422421

423422
// Once every 1000 iterations and at the end, verify the full cache.
424423
if (insecure_rand() % 1000 == 1 || i == NUM_SIMULATION_ITERATIONS - 1) {
425-
BOOST_TEST_MESSAGE("updatecoins_simulation_test - verifying full cache");
426424
for (auto it = result.begin(); it != result.end(); it++) {
427425
bool have = stack.back()->HaveCoin(it->first);
428426
const Coin& coin = stack.back()->AccessCoin(it->first);

src/test/prevector_tests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ class prevector_tester {
186186
BOOST_AUTO_TEST_CASE(PrevectorTestInt)
187187
{
188188
for (int j = 0; j < 64; j++) {
189-
BOOST_TEST_MESSAGE("PrevectorTestInt " << j);
190189
prevector_tester<8, int> test;
191190
for (int i = 0; i < 2048; i++) {
192191
int r = insecure_rand();

src/test/versionbits_tests.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ BOOST_FIXTURE_TEST_SUITE(versionbits_tests, TestingSetup)
136136
BOOST_AUTO_TEST_CASE(versionbits_test)
137137
{
138138
for (int i = 0; i < 64; i++) {
139-
BOOST_TEST_MESSAGE("versionbits_test " << i);
140-
141139
// DEFINED -> FAILED
142140
VersionBitsTester().TestDefined()
143141
.Mine(1, TestTime(1), 0x100).TestDefined()

0 commit comments

Comments
 (0)