Skip to content

Commit 00902c4

Browse files
committed
Rename qa directory to test
1 parent d34995a commit 00902c4

File tree

101 files changed

+29
-29
lines changed

Some content is hidden

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

101 files changed

+29
-29
lines changed

Makefile.am

+4-4
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ test_bitcoin_filtered.info: test_bitcoin.info
195195
$(LCOV) -r $< "/usr/include/*" -o $@
196196

197197
rpc_test.info: test_bitcoin_filtered.info
198-
-@TIMEOUT=15 python qa/pull-tester/rpc-tests.py $(EXTENDED_RPC_TESTS)
198+
-@TIMEOUT=15 python test/pull-tester/rpc-tests.py $(EXTENDED_RPC_TESTS)
199199
$(LCOV) -c -d $(abs_builddir)/src --t rpc-tests -o $@
200200
$(LCOV) -z -d $(abs_builddir)/src
201201
$(LCOV) -z -d $(abs_builddir)/src/leveldb
@@ -223,7 +223,7 @@ endif
223223

224224
dist_noinst_SCRIPTS = autogen.sh
225225

226-
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.py qa/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/rpc-tests $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
227227

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

@@ -232,5 +232,5 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
232232
DISTCHECK_CONFIGURE_FLAGS = --enable-man
233233

234234
clean-local:
235-
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
236-
rm -rf qa/pull-tester/__pycache__
235+
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
236+
rm -rf test/pull-tester/__pycache__

README.md

+2-2

configure.ac

+4-4
Original file line numberDiff line numberDiff line change
@@ -1148,9 +1148,9 @@ AC_SUBST(ZMQ_LIBS)
11481148
AC_SUBST(PROTOBUF_LIBS)
11491149
AC_SUBST(QR_LIBS)
11501150
AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
1151-
AC_CONFIG_FILES([qa/pull-tester/tests_config.ini],[chmod +x qa/pull-tester/tests_config.ini])
1151+
AC_CONFIG_FILES([test/pull-tester/tests_config.ini],[chmod +x test/pull-tester/tests_config.ini])
11521152
AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
1153-
AC_CONFIG_LINKS([qa/pull-tester/rpc-tests.py:qa/pull-tester/rpc-tests.py])
1153+
AC_CONFIG_LINKS([test/pull-tester/rpc-tests.py:test/pull-tester/rpc-tests.py])
11541154

11551155
dnl boost's m4 checks do something really nasty: they export these vars. As a
11561156
dnl result, they leak into secp256k1's configure and crazy things happen.
@@ -1198,8 +1198,8 @@ esac
11981198
dnl Replace the BUILDDIR path with the correct Windows path if compiling on Native Windows
11991199
case ${OS} in
12001200
*Windows*)
1201-
sed 's/BUILDDIR="\/\([[a-z]]\)/BUILDDIR="\1:/' qa/pull-tester/tests_config.py > qa/pull-tester/tests_config-2.py
1202-
mv qa/pull-tester/tests_config-2.py qa/pull-tester/tests_config.py
1201+
sed 's/BUILDDIR="\/\([[a-z]]\)/BUILDDIR="\1:/' test/pull-tester/tests_config.py > test/pull-tester/tests_config-2.py
1202+
mv test/pull-tester/tests_config-2.py test/pull-tester/tests_config.py
12031203
;;
12041204
esac
12051205

contrib/devtools/copyright_header.py

+1-1
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-
'qa/rpc-tests/test_framework/bignum.py',
35+
'test/rpc-tests/test_framework/bignum.py',
3636
# python init:
3737
'*__init__.py',
3838
]

contrib/rpm/bitcoin.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ make check
314314
pushd src
315315
srcdir=. test/bitcoin-util-test.py
316316
popd
317-
qa/pull-tester/rpc-tests.py -extended
317+
test/pull-tester/rpc-tests.py -extended
318318

319319
%post libs -p /sbin/ldconfig
320320

doc/developer-notes.md

+2-2

qa/README.md test/README.md

+8-8

qa/pull-tester/rpc-tests.py test/pull-tester/rpc-tests.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RPC tests are disabled on Windows by default. Use --force to run them anyway.
1212
1313
For a description of arguments recognized by test scripts, see
14-
`qa/pull-tester/test_framework/test_framework.py:BitcoinTestFramework.main`.
14+
`test/pull-tester/test_framework/test_framework.py:BitcoinTestFramework.main`.
1515
1616
"""
1717

@@ -171,7 +171,7 @@ def main():
171171
import zmq
172172
except ImportError:
173173
print("ERROR: \"import zmq\" failed. Use -nozmq to run without the ZMQ tests."
174-
"To run zmq tests, see dependency info in /qa/README.md.")
174+
"To run zmq tests, see dependency info in /test/README.md.")
175175
raise
176176

177177
# Build list of tests
@@ -206,7 +206,7 @@ def main():
206206
if args.help:
207207
# Print help for rpc-tests.py, then print help of the first script and exit.
208208
parser.print_help()
209-
subprocess.check_call((config["environment"]["SRCDIR"] + '/qa/rpc-tests/' + test_list[0]).split() + ['-h'])
209+
subprocess.check_call((config["environment"]["SRCDIR"] + '/test/rpc-tests/' + test_list[0]).split() + ['-h'])
210210
sys.exit(0)
211211

212212
run_tests(test_list, config["environment"]["SRCDIR"], config["environment"]["BUILDDIR"], config["environment"]["EXEEXT"], args.jobs, args.coverage, passon_args)
@@ -222,10 +222,10 @@ def run_tests(test_list, src_dir, build_dir, exeext, jobs=1, enable_coverage=Fal
222222
if "BITCOIND" not in os.environ:
223223
os.environ["BITCOIND"] = build_dir + '/src/bitcoind' + exeext
224224

225-
tests_dir = src_dir + '/qa/rpc-tests/'
225+
tests_dir = src_dir + '/test/rpc-tests/'
226226

227227
flags = ["--srcdir={}/src".format(build_dir)] + args
228-
flags.append("--cachedir=%s/qa/cache" % build_dir)
228+
flags.append("--cachedir=%s/test/cache" % build_dir)
229229

230230
if enable_coverage:
231231
coverage = RPCCoverage()
@@ -335,7 +335,7 @@ class RPCCoverage(object):
335335
After all tests complete, the commands run are combined and diff'd against
336336
the complete list to calculate uncovered RPC commands.
337337
338-
See also: qa/rpc-tests/test_framework/coverage.py
338+
See also: test/rpc-tests/test_framework/coverage.py
339339
340340
"""
341341
def __init__(self):
@@ -363,7 +363,7 @@ def _get_uncovered_rpc_commands(self):
363363
Return a set of currently untested RPC commands.
364364
365365
"""
366-
# This is shared from `qa/rpc-tests/test-framework/coverage.py`
366+
# This is shared from `test/rpc-tests/test-framework/coverage.py`
367367
reference_filename = 'rpc_interface.txt'
368368
coverage_file_prefix = 'coverage.'
369369

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)