aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2018-03-17 19:28:02 -0400
committerMarcoFalke <[email protected]>2018-03-17 19:28:04 -0400
commit00d1680498c5550e7db1f359202d3433a092fafd (patch)
tree69a598d726adba48fda35334a6ea8a20781d1028
parentMerge #12437: [Trivial] Simplify if-else blocks and more descriptive variable... (diff)
parentAppend scripts to new test_list array to fix bad assignment (diff)
downloaddiscoin-00d1680498c5550e7db1f359202d3433a092fafd.tar.xz
discoin-00d1680498c5550e7db1f359202d3433a092fafd.zip
Merge #12710: Append scripts to new test_list array to fix bad assignment
b0fec8d623 Append scripts to new test_list array to fix bad assignment (Jeff Rade) Pull request description: Fixes review by @MarcoFalke in PR [#12437](https://github.com/bitcoin/bitcoin/pull/12437) Assignment of `test_list` would point to the same array object as `BASE_SCRIPT` or `ALL_SCRIPTS` which we do not want. Tree-SHA512: 57d6c1f4563aaffbac68e96782283799b10be687292152d70ffbbc22e7b52c11c1af0c483acb01c69fbaa99bdae01431b65a5d1d0a913d549f58dfd95d0d28d9
-rwxr-xr-xtest/functional/test_runner.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index f5d160f21..673cdb506 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -236,11 +236,11 @@ def main():
sys.exit(0)
# Build list of tests
+ test_list = []
if tests:
# Individual tests have been specified. Run specified tests that exist
# in the ALL_SCRIPTS list. Accept the name with or without .py extension.
tests = [re.sub("\.py$", "", test) + ".py" for test in tests]
- test_list = []
for test in tests:
if test in ALL_SCRIPTS:
test_list.append(test)
@@ -248,10 +248,10 @@ def main():
print("{}WARNING!{} Test '{}' not found in full test list.".format(BOLD[1], BOLD[0], test))
elif args.extended:
# Include extended tests
- test_list = ALL_SCRIPTS
+ test_list += ALL_SCRIPTS
else:
# Run base tests only
- test_list = BASE_SCRIPTS
+ test_list += BASE_SCRIPTS
# Remove the test cases that the user has explicitly asked to exclude.
if args.exclude: