Skip to content

Commit 6f1d906

Browse files
committed
Merge bitcoin#30063: build, test: Remove unused TIMEOUT environment variable
189d0da build, test: Remove unused `TIMEOUT` environment variable (Hennadii Stepanov) Pull request description: Setting the `TIMEOUT` environment variable has been a noop in both cases since its introduction. It seems to have been inadvertently copy-pasted from existed code. For example, in commit d80e3cb, it was needlessly copied from a valid case a few lines above for the `qa/pull-tester/run-bitcoind-for-test.sh` script. ACKs for top commit: maflcko: utACK 189d0da edilmedeiros: ACK 189d0da Tree-SHA512: 61111eba30e0c82a0220bea48eba451cd9caa68785b48ec8a91059ca5aadfaff2f6d2ccdc5aa737c5cefa33579cb735431bb9e94bda8fa047825d7bd28d542fb
2 parents 4300325 + 189d0da commit 6f1d906

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ baseline_filtered.info: baseline.info
186186
$(LCOV) -a $@ $(LCOV_OPTS) -o $@
187187

188188
fuzz.info: baseline_filtered.info
189-
@TIMEOUT=15 test/fuzz/test_runner.py $(DIR_FUZZ_SEED_CORPUS) -l DEBUG
189+
@test/fuzz/test_runner.py $(DIR_FUZZ_SEED_CORPUS) -l DEBUG
190190
$(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src --t fuzz-tests -o $@
191191
$(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src
192192

@@ -204,7 +204,7 @@ test_bitcoin_filtered.info: test_bitcoin.info
204204
$(LCOV) -a $@ $(LCOV_OPTS) -o $@
205205

206206
functional_test.info: test_bitcoin_filtered.info
207-
@TIMEOUT=15 test/functional/test_runner.py $(EXTENDED_FUNCTIONAL_TESTS)
207+
@test/functional/test_runner.py $(EXTENDED_FUNCTIONAL_TESTS)
208208
$(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src --t functional-tests -o $@
209209
$(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src
210210

0 commit comments

Comments
 (0)