Ava Chow 5ebb406357 Merge bitcoin/bitcoin#26564: test: test_bitcoin: allow -testdatadir=<datadir> ... d27e2d87b9 test: test_bitcoin: allow -testdatadir=<datadir> (Larry Ruane) Pull request description: This backward-compatible change would help with code review, testing, and debugging. When `test_bitcoin` runs, it creates a working or data directory within `/tmp/test_common_Bitcoin\ Core/`, named as a long random (hex) string. This small patch does three things: - If the (new) argument `-testdatadir=<datadir>` is given, use `<datadir>/test_temp/<test-name>/datadir` as the working directory - When the test starts, remove `<datadir>/test_temp/<test-name>/datadir` if it exists from an earlier run (currently, it's presumed not to exist due to the long random string) - Don't delete the working directory at the end of the test if a custom data directory is being used Example usage, which will remove, create, use `/somewhere/test_temp/getarg_tests/boolarg`, and leave it afterward: ``` $ test_bitcoin --run_test=getarg_tests/boolarg -- -testdatadir=/somewhere Running 1 test case... Test directory (will not be deleted): "/somewhere/test_temp/getarg_tests/boolarg/datadir" *** No errors detected $ ls -l /somewhere/test_temp/getarg_tests/boolarg/datadir total 8 drwxrwxr-x 2 larry larry 4096 Feb 22 10:28 blocks -rw-rw-r-- 1 larry larry 1273 Feb 22 10:28 debug.log ``` (A relative pathname also works.) This change affects only `test_bitcoin`; it could also be applied to `test_bitcoin-qt` but that's slightly more involved so I'm skipping that for now. The rationale for this change is that, when running the test using the debugger, it's often useful to watch `debug.log` as the test runs and inspect some of the other files (I've looked at the generated `blknnnn.dat` files for example). Currently, that requires figuring out where the test's working directory is since it changes on every test run. Tests can be run with `-printtoconsole=1` to show debug logging to the terminal, but it's nice to keep `debug.log` continuously open in an editor, for example. Even if not using a debugger, it's sometimes helpful to see `debug.log` and other artifacts after the test completes. Similar functionality is already possible with the functional tests using the `--tmpdir=` and `--nocleanup` arguments. ACKs for top commit: davidgumberg: ACK d27e2d87b9 tdb3: re-ACK for d27e2d87b9 achow101: ACK d27e2d87b9 cbergqvist: ACK d27e2d87b95b7982c05b4c88e463cc9626ab9f0a! (Already did some testing with `fs::remove()` to make sure it was compatible with the `util::Lock/UnlockDirectory` implementation). marcofleon: ACK d27e2d87b9. I ran all the tests with my previous open file limit and no errors were detected. Also ran some individual tests with no, relative, and absolute paths and everything looks good. furszy: ACK d27e2d8 Tree-SHA512: a8f535f34a48b6699cb440f97f5562ec643f3bfba4ea685768980b871fc8b6e1135f70fc05dbe19aa2c8bacb1ddeaff212d63473605a7422ff76332b3a6b1f68		2024-03-11 07:03:02 -04:00
..
bench	Merge bitcoin/bitcoin#26564: test: test_bitcoin: allow -testdatadir=<datadir>	2024-03-11 07:03:02 -04:00
common	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
compat	serialization: use internal endian conversion functions	2024-02-28 13:42:38 +00:00
config
consensus	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
crc32c	Update crc32c subtree to latest upstream master	2024-02-27 18:28:19 +00:00
crypto	Merge bitcoin/bitcoin#29263: serialization: c++20 endian/byteswap/clz modernization	2024-03-01 11:19:58 -05:00
index	refactor: De-globalize g_signals	2024-02-15 14:37:01 +01:00
init	doc: add unconditional info loglevel following merge of PR 28318	2024-01-11 11:01:28 -06:00
interfaces	Merge bitcoin/bitcoin#28890: rpc: Remove deprecated -rpcserialversion	2024-01-05 10:42:10 +00:00
ipc	multiprocess: Add type conversion code for UniValue types	2023-11-28 12:35:50 -05:00
kernel	Merge bitcoin/bitcoin#28960: kernel: Remove dependency on CScheduler	2024-03-08 20:58:04 -05:00
leveldb
logging	Use steady clock for logging timer	2023-01-31 18:48:50 +01:00
minisketch
node	scripted-diff: Rename MainSignals to ValidationSignals	2024-02-15 14:45:51 +01:00
policy	[doc] fix docs and comments from v3	2024-02-12 14:27:25 +00:00
primitives	[validation] Cache merkle root and witness commitment checks	2024-02-27 14:19:15 +00:00
qt	Merge bitcoin/bitcoin#26564: test: test_bitcoin: allow -testdatadir=<datadir>	2024-03-11 07:03:02 -04:00
rpc	Merge bitcoin/bitcoin#28960: kernel: Remove dependency on CScheduler	2024-03-08 20:58:04 -05:00
script	wallet: fix key parsing check for miniscript expressions in ParseScript	2023-12-08 06:54:00 -03:00
secp256k1	Update secp256k1 subtree to latest master	2024-01-04 14:40:28 +00:00
support	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
test	Merge bitcoin/bitcoin#26564: test: test_bitcoin: allow -testdatadir=<datadir>	2024-03-11 07:03:02 -04:00
univalue	Remove unused raw-pointer read helper from univalue	2023-07-27 14:24:52 +02:00
util	Merge bitcoin/bitcoin#28960: kernel: Remove dependency on CScheduler	2024-03-08 20:58:04 -05:00
wallet	Merge bitcoin/bitcoin#28960: kernel: Remove dependency on CScheduler	2024-03-08 20:58:04 -05:00
zmq	Remove deprecated -rpcserialversion	2023-12-11 18:22:13 +01:00
.bear-tidy-config	tidy: modernize-use-emplace	2023-10-12 11:27:19 +02:00
.clang-format	refactor: Print verbose serialize compiler error messages	2023-12-15 15:20:54 +01:00
.clang-tidy	refactor: Fix bugprone-string-constructor warning	2023-10-30 14:59:17 +01:00
addrdb.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
addrdb.h	Use serialization parameters for CAddress serialization	2023-09-05 10:13:25 +02:00
addresstype.cpp	Add PubKeyDestination for P2PK scripts	2023-09-12 12:14:31 -04:00
addresstype.h	bugfix: Mark CNoDestination and PubKeyDestination constructor explicit	2023-10-25 22:46:55 +02:00
addrman.cpp	Merge bitcoin/bitcoin#29404: refactor: bitcoin-config.h includes cleanup	2024-02-20 13:07:48 +00:00
addrman.h	doc, test: Test and explain service flag handling	2024-01-15 16:19:53 -05:00
addrman_impl.h	net: Optionally include terrible addresses in GetAddr results	2023-10-04 18:08:49 +02:00
arith_uint256.cpp	refactor: Remove unused and fragile string interface from arith_uint256	2023-11-21 17:37:25 +01:00
arith_uint256.h	refactor: Remove unused and fragile string interface from arith_uint256	2023-11-21 17:37:25 +01:00
attributes.h	Introduce platform-agnostic ALWAYS_INLINE macro	2023-05-04 20:57:51 +01:00
banman.cpp	Merge bitcoin/bitcoin#24097: Replace RecursiveMutex m_cs_banned with Mutex, and rename it	2023-11-02 14:09:27 -04:00
banman.h	Merge bitcoin/bitcoin#24097: Replace RecursiveMutex m_cs_banned with Mutex, and rename it	2023-11-02 14:09:27 -04:00
base58.cpp
base58.h
bech32.cpp
bech32.h
bip324.cpp	net: merge V2Transport constructors, move key gen	2023-09-10 16:11:52 -04:00
bip324.h	net: merge V2Transport constructors, move key gen	2023-09-10 16:11:52 -04:00
bitcoin-chainstate.cpp	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
bitcoin-cli-res.rc
bitcoin-cli.cpp	Fix -netinfo backward compat with getpeerinfo pre-v26	2024-01-09 15:27:08 -06:00
bitcoin-tx-res.rc
bitcoin-tx.cpp	doc: Update bitcoin-tx replaceable documentation	2023-12-11 13:08:46 -05:00
bitcoin-util-res.rc
bitcoin-util.cpp	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
bitcoin-wallet-res.rc
bitcoin-wallet.cpp	refactor: Move system from util to common library	2023-05-20 12:08:13 +02:00
bitcoind-res.rc
bitcoind.cpp	Get rid of shutdown.cpp/shutdown.h, use SignalInterrupt directly	2023-12-04 15:39:15 -04:00
blockencodings.cpp	serialize: Drop useless version param from GetSerializeSize()	2023-11-16 11:14:13 +10:00
blockencodings.h	Use ParamsWrapper for witness serialization	2023-11-14 08:45:30 +10:00
blockfilter.cpp	refactor: SpanReader without nVersion	2023-11-28 12:42:07 +01:00
blockfilter.h	Remove unused includes from blockfilter.h	2023-08-17 18:28:15 +02:00
chain.cpp
chain.h	refactor: Fix timedata includes	2024-02-01 13:52:05 +01:00
chainparams.cpp	test: Throw error when -signetchallenge is non-hex	2023-05-25 19:24:05 +02:00
chainparams.h	test: Throw error when -signetchallenge is non-hex	2023-05-25 19:24:05 +02:00
chainparamsbase.cpp	refactor: Use ChainType enum exhaustively	2023-05-10 10:39:58 +02:00
chainparamsbase.h	refactor: Use ChainType enum exhaustively	2023-05-10 10:39:58 +02:00
chainparamsseeds.h	seeds: Update testnet seeds	2024-03-04 19:53:30 -05:00
checkqueue.h	refactor: Make CCheckQueue non-copyable and non-movable explicitly	2023-10-03 10:52:17 +01:00
clientversion.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
clientversion.h
coins.cpp	Use Txid in COutpoint	2023-11-21 13:15:44 +00:00
coins.h	Merge bitcoin/bitcoin#28922: Use Txid in COutpoint	2023-11-24 14:41:58 +00:00
compressor.cpp	Clean up things that include script/standard.h	2023-08-14 17:38:27 -04:00
compressor.h
core_io.h	Remove deprecated -rpcserialversion	2023-12-11 18:22:13 +01:00
core_memusage.h
core_read.cpp	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
core_write.cpp	Remove deprecated -rpcserialversion	2023-12-11 18:22:13 +01:00
cuckoocache.h	clang-tidy: Fix modernize-use-default-member-init in headers	2023-01-31 11:50:10 +00:00
dbwrapper.cpp	dbwrapper: Use DataStream for batch operations	2023-09-12 12:07:39 +02:00
dbwrapper.h	dbwrapper: Use DataStream for batch operations	2023-09-12 12:07:39 +02:00
deploymentinfo.cpp	Decouple RegTestChainParams from ArgsManager	2023-03-15 16:42:42 +01:00
deploymentinfo.h	Decouple RegTestChainParams from ArgsManager	2023-03-15 16:42:42 +01:00
deploymentstatus.cpp
deploymentstatus.h
dummywallet.cpp	move-only: Extract common/args and common/config.cpp from util/system	2023-04-19 10:48:30 +02:00
external_signer.cpp	Remove unused version.h include	2023-11-30 11:28:19 +01:00
external_signer.h	refactor: Move system from util to common library	2023-05-20 12:08:13 +02:00
flatfile.cpp	refactor: Extract util/fs_helpers from util/system	2023-03-23 12:52:00 +01:00
flatfile.h	Merge bitcoin/bitcoin#27254: refactor: Extract util/fs from util/system	2023-04-03 14:41:22 +01:00
hash.cpp	crypto, hash: replace custom rotl32 with std::rotl	2024-01-05 17:12:38 +01:00
hash.h	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
headerssync.cpp	refactor: Fix timedata includes	2024-02-01 13:52:05 +01:00
headerssync.h
httprpc.cpp	refactor: drop protocol.h include header in rpc/util.h	2023-09-19 15:54:17 -06:00
httprpc.h
httpserver.cpp	Merge bitcoin/bitcoin#28318: logging: Simplify API for level based logging	2024-01-10 14:11:32 -05:00
httpserver.h	refactor: Remove call to ShutdownRequested from HTTPRequest	2023-12-04 15:39:15 -04:00
i2p.cpp	Merge bitcoin/bitcoin#29393: i2p: log connection was refused due to arbitrary port	2024-03-08 21:15:24 -05:00
i2p.h	i2p: destroy the session if we get an unexpected error from the I2P router	2023-10-05 14:11:13 +02:00
indirectmap.h
init.cpp	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
init.h	Get rid of shutdown.cpp/shutdown.h, use SignalInterrupt directly	2023-12-04 15:39:15 -04:00
key.cpp	refactor: Allow std::span construction from CKey	2024-01-16 15:29:18 +01:00
key.h	refactor: Allow std::span construction from CKey	2024-01-16 15:29:18 +01:00
key_io.cpp	refactor: Allow std::span construction from CKey	2024-01-16 15:29:18 +01:00
key_io.h	Clean up things that include script/standard.h	2023-08-14 17:38:27 -04:00
logging.cpp	logging: add -loglevelalways=1 option	2023-12-15 11:03:25 +10:00
logging.h	logging: add LogError, LogWarning, LogInfo, LogDebug, LogTrace	2023-12-20 15:59:48 +10:00
Makefile.am	Merge bitcoin/bitcoin#28960: kernel: Remove dependency on CScheduler	2024-03-08 20:58:04 -05:00
Makefile.bench.include	bench: Add a benchmark for ismine	2024-02-16 14:35:33 -05:00
Makefile.crc32c.include
Makefile.leveldb.include
Makefile.minisketch.include
Makefile.qt.include	Merge bitcoin/bitcoin#22764: build: Include qt sources for parsing with extract_strings.py	2023-10-19 13:25:49 +01:00
Makefile.qt_locale.include	qt: 27.0 translations update	2024-03-04 10:02:26 +00:00
Makefile.qttest.include
Makefile.test.include	test: Add makefile target for running unit tests	2024-02-03 17:59:43 +01:00
Makefile.test_fuzz.include	fuzz: move MockedDescriptorConverter to fuzz/util	2023-11-20 15:57:50 -03:00
Makefile.test_util.include	Merge bitcoin/bitcoin#27425: test: move remaining rand code from util/setup_common to util/random	2023-07-19 10:26:11 +01:00
Makefile.univalue.include
mapport.cpp	Remove the syscall sandbox	2023-06-16 10:38:19 +01:00
mapport.h
memusage.h	add std::list to memusage	2023-09-13 11:37:45 +01:00
merkleblock.cpp	refactor: Use Txid in CMerkleBlock	2023-11-28 17:49:41 +01:00
merkleblock.h	refactor: Use Txid in CMerkleBlock	2023-11-28 17:49:41 +01:00
net.cpp	Merge bitcoin/bitcoin#28170: p2p: adaptive connections services flags	2024-01-31 11:44:41 -05:00
net.h	Merge bitcoin/bitcoin#29347: net: enable v2transport by default	2024-01-31 15:33:57 -05:00
net_permissions.cpp	Merge bitcoin/bitcoin#26078: p2p: return CSubNet in LookupSubNet	2023-10-26 14:29:47 -04:00
net_permissions.h
net_processing.cpp	Rename CalculateHeadersWork to CalculateClaimedHeadersWork	2024-03-05 10:01:24 -05:00
net_processing.h	net: move state dependent peer services flags	2024-01-15 10:28:20 -03:00
net_types.cpp	p2p: return CSubNet in LookupSubNet	2023-05-30 16:27:21 -03:00
net_types.h
netaddress.cpp	Inline short, often-called, rarely-changed basic CNetAddr getters	2023-07-19 12:43:05 -06:00
netaddress.h	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
netbase.cpp	Merge bitcoin/bitcoin#28649: Do the SOCKS5 handshake reliably	2023-11-07 14:11:58 -05:00
netbase.h	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
netgroup.cpp	Merge bitcoin/bitcoin#27581: net: Continuous ASMap health check	2023-12-06 11:22:42 -05:00
netgroup.h	net: Add continuous ASMap health check logging	2023-12-02 22:03:08 +01:00
netmessagemaker.h	refactor: NetMsg::Make() without nVersion	2023-11-20 14:02:27 +01:00
noui.cpp
noui.h
outputtype.cpp	Clean up things that include script/standard.h	2023-08-14 17:38:27 -04:00
outputtype.h	Move CTxDestination to its own file	2023-08-14 17:38:27 -04:00
pow.cpp
pow.h
prevector.h	refactor: Mark prevector iterator with std::contiguous_iterator_tag	2024-01-18 19:29:34 +01:00
protocol.cpp	net: remove now unused global 'g_initial_block_download_completed'	2024-01-23 10:25:16 -03:00
protocol.h	net: remove now unused global 'g_initial_block_download_completed'	2024-01-23 10:25:16 -03:00
psbt.cpp	Remove unused version.h include	2023-11-30 11:28:19 +01:00
psbt.h	refactor: SpanReader without nVersion	2023-11-28 12:42:07 +01:00
pubkey.cpp	pubkey: introduce a GetEvenCorrespondingCPubKey helper	2023-10-08 02:43:19 +02:00
pubkey.h	Add missing XOnlyPubKey::data() to get mutable data	2024-01-16 10:58:57 +01:00
random.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
random.h	crypto: replace CountBits with std::bit_width	2024-02-26 16:13:12 +00:00
randomenv.cpp	[refactor] Remove compat.h from kernel headers	2023-09-12 22:51:48 +02:00
randomenv.h
rest.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
rest.h
reverse_iterator.h
scheduler.cpp	scripted-diff: Rename SingleThreadedSchedulerClient to SerialTaskRunner	2024-02-15 14:43:14 +01:00
scheduler.h	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
serialize.h	Merge bitcoin/bitcoin#29263: serialization: c++20 endian/byteswap/clz modernization	2024-03-01 11:19:58 -05:00
signet.cpp	refactor: SpanReader without nVersion	2023-11-28 12:42:07 +01:00
signet.h
span.h	Allow int8_t optimized vector serialization	2023-12-22 09:58:19 +01:00
streams.cpp	streams: Teach AutoFile how to XOR	2023-07-19 18:12:42 +02:00
streams.h	Remove unused CDataStream	2023-11-30 11:27:54 +01:00
sync.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
sync.h	Merge bitcoin/bitcoin#27116: doc: clarify that LOCK() internally checks whether the mutex is held	2023-10-26 15:02:13 -04:00
threadsafety.h
timedata.cpp	Remove GetAdjustedTime	2024-01-05 17:16:38 +00:00
timedata.h	refactor: Fix timedata includes	2024-02-01 13:52:05 +01:00
tinyformat.h	clang-tidy: Fix modernize-use-default-member-init in headers	2023-01-31 11:50:10 +00:00
torcontrol.cpp	Merge bitcoin/bitcoin#28318: logging: Simplify API for level based logging	2024-01-10 14:11:32 -05:00
torcontrol.h	doc, refactor: Changing -torcontrol help to specify that a default port is used	2023-08-17 23:58:47 -05:00
txdb.cpp	Merge bitcoin/bitcoin#28195: blockstorage: Drop legacy -txindex check	2023-09-05 11:37:35 +01:00
txdb.h	move-only: Move CBlockTreeDB to node/blockstorage	2023-08-01 15:27:33 +02:00
txmempool.cpp	[refactor] Make signals optional in mempool and chainman	2024-02-15 13:28:45 +01:00
txmempool.h	scripted-diff: Rename MainSignals to ValidationSignals	2024-02-15 14:45:51 +01:00
txorphanage.cpp	fuzz: Improve fuzzing stability for txorphan harness	2023-12-08 13:14:46 +00:00
txorphanage.h	fuzz: Improve fuzzing stability for txorphan harness	2023-12-08 13:14:46 +00:00
txrequest.cpp	refactor: modernize-use-default-member-init for bit-fields (C++20)	2023-12-07 11:06:01 +01:00
txrequest.h
uint256.cpp
uint256.h	Merge bitcoin/bitcoin#27927: util: Allow std::byte and char Span serialization	2023-06-28 15:12:12 -04:00
undo.h	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
validation.cpp	Merge bitcoin/bitcoin#29569: Rename CalculateHeadersWork to CalculateClaimedHeadersWork	2024-03-08 21:39:07 -05:00
validation.h	Rename CalculateHeadersWork to CalculateClaimedHeadersWork	2024-03-05 10:01:24 -05:00
validationinterface.cpp	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
validationinterface.h	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
versionbits.cpp
versionbits.h
walletinitinterface.h
warnings.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
warnings.h