@@ -61,7 +61,7 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
61
61
62
62
COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
63
63
leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
64
- baseline_filtered.info rpc_test .info rpc_test_filtered .info \
64
+ baseline_filtered.info functional_test .info functional_test_filtered .info \
65
65
leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
66
66
67
67
dist-hook :
@@ -194,20 +194,20 @@ test_bitcoin.info: baseline_filtered_combined.info
194
194
test_bitcoin_filtered.info : test_bitcoin.info
195
195
$(LCOV ) -r $< " /usr/include/*" -o $@
196
196
197
- rpc_test .info : test_bitcoin_filtered.info
197
+ functional_test .info : test_bitcoin_filtered.info
198
198
-@TIMEOUT=15 python test/pull-tester/rpc-tests.py $(EXTENDED_RPC_TESTS )
199
- $(LCOV ) -c -d $(abs_builddir ) /src --t rpc -tests -o $@
199
+ $(LCOV ) -c -d $(abs_builddir ) /src --t functional -tests -o $@
200
200
$(LCOV ) -z -d $(abs_builddir ) /src
201
201
$(LCOV ) -z -d $(abs_builddir ) /src/leveldb
202
202
203
- rpc_test_filtered .info : rpc_test .info
203
+ functional_test_filtered .info : functional_test .info
204
204
$(LCOV ) -r $< " /usr/include/*" -o $@
205
205
206
206
test_bitcoin_coverage.info : baseline_filtered_combined.info test_bitcoin_filtered.info
207
207
$(LCOV ) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
208
208
209
- total_coverage.info : baseline_filtered_combined.info test_bitcoin_filtered.info rpc_test_filtered .info
210
- $(LCOV ) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a rpc_test_filtered .info -o $@ | $(GREP ) " \%" | $(AWK ) ' { print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
209
+ total_coverage.info : baseline_filtered_combined.info test_bitcoin_filtered.info functional_test_filtered .info
210
+ $(LCOV ) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a functional_test_filtered .info -o $@ | $(GREP ) " \%" | $(AWK ) ' { print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
211
211
212
212
test_bitcoin.coverage/.dirstamp : test_bitcoin_coverage.info
213
213
$(GENHTML ) -s $< -o $(@D )
@@ -223,7 +223,7 @@ endif
223
223
224
224
dist_noinst_SCRIPTS = autogen.sh
225
225
226
- EXTRA_DIST = $(top_srcdir ) /share/genbuild.sh test/pull-tester/rpc-tests.py test/rpc-tests $(DIST_CONTRIB ) $(DIST_DOCS ) $(WINDOWS_PACKAGING ) $(OSX_PACKAGING ) $(BIN_CHECKS )
226
+ EXTRA_DIST = $(top_srcdir ) /share/genbuild.sh test/pull-tester/rpc-tests.py test/functional $(DIST_CONTRIB ) $(DIST_DOCS ) $(WINDOWS_PACKAGING ) $(OSX_PACKAGING ) $(BIN_CHECKS )
227
227
228
228
CLEANFILES = $(OSX_DMG ) $(BITCOIN_WIN_INSTALLER )
229
229
0 commit comments