Skip to content

Commit c28ee91

Browse files
committed
Rename rpc-tests directory to functional
1 parent 00902c4 commit c28ee91

File tree

100 files changed

+25
-26
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+25
-26
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ script:
7070
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
7171
- export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
7272
- if [ "$RUN_TESTS" = "true" ]; then make $MAKEJOBS check VERBOSE=1; fi
73-
- if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.py --coverage; fi
73+
- if [ "$RUN_TESTS" = "true" ]; then functional/pull-tester/rpc-tests.py --coverage; fi
7474
after_script:
7575
- echo $TRAVIS_COMMIT_RANGE
7676
- echo $TRAVIS_COMMIT_LOG

Makefile.am

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
6161

6262
COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
6363
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 \
6565
leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
6666

6767
dist-hook:
@@ -194,20 +194,20 @@ test_bitcoin.info: baseline_filtered_combined.info
194194
test_bitcoin_filtered.info: test_bitcoin.info
195195
$(LCOV) -r $< "/usr/include/*" -o $@
196196

197-
rpc_test.info: test_bitcoin_filtered.info
197+
functional_test.info: test_bitcoin_filtered.info
198198
-@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 $@
200200
$(LCOV) -z -d $(abs_builddir)/src
201201
$(LCOV) -z -d $(abs_builddir)/src/leveldb
202202

203-
rpc_test_filtered.info: rpc_test.info
203+
functional_test_filtered.info: functional_test.info
204204
$(LCOV) -r $< "/usr/include/*" -o $@
205205

206206
test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
207207
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
208208

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
211211

212212
test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info
213213
$(GENHTML) -s $< -o $(@D)
@@ -223,7 +223,7 @@ endif
223223

224224
dist_noinst_SCRIPTS = autogen.sh
225225

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)
227227

228228
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
229229

README.md

Lines changed: 1 addition & 1 deletion

configure.ac

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,8 +1147,7 @@ AC_SUBST(EVENT_PTHREADS_LIBS)
11471147
AC_SUBST(ZMQ_LIBS)
11481148
AC_SUBST(PROTOBUF_LIBS)
11491149
AC_SUBST(QR_LIBS)
1150-
AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
1151-
AC_CONFIG_FILES([test/pull-tester/tests_config.ini],[chmod +x test/pull-tester/tests_config.ini])
1150+
AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py test/pull-tester/tests_config.ini])
11521151
AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
11531152
AC_CONFIG_LINKS([test/pull-tester/rpc-tests.py:test/pull-tester/rpc-tests.py])
11541153

contrib/devtools/copyright_header.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
'src/tinyformat.h',
3333
'src/leveldb/util/env_win.cc',
3434
'src/crypto/ctaes/bench.c',
35-
'test/rpc-tests/test_framework/bignum.py',
35+
'test/functional/test_framework/bignum.py',
3636
# python init:
3737
'*__init__.py',
3838
]

doc/developer-notes.md

Lines changed: 2 additions & 2 deletions

test/README.md

Lines changed: 3 additions & 3 deletions
File renamed without changes.

0 commit comments

Comments
 (0)