phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-25 10:43:19 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge #20245: test: Run script_assets_test even if built --with-libs=no

Browse source 
fa3967efdb test: Replace ARRAYLEN with C++11 ranged for loop (MarcoFalke)
fafc529053 test: Run AssetTest even if built --with-libs=no (MarcoFalke)
faf58ab139 ci: Add --with-libs=no to one ci config (MarcoFalke)

Pull request description:

  `script_assets_test` doesn't call libbitcoinconsensus, so it seems confusing to require it

ACKs for top commit:
  fanquake:
    ACK fa3967efdb - looks ok to me.

Tree-SHA512: 8744fef64c5d7dc19a0ef4ae9b3df5b3f356253bf000f12723064794c5e50df071824d436059985f1112d94c1b530b65cbeb6b8435114a91b195480620eafc59
This commit is contained in:
MarcoFalke 2020-11-04 08:50:42 +01:00
commit 88776c2926
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci/test/00_setup_env_native_qt5.sh
View file

@ -16,4 +16,4 @@ export RUN_UNIT_TESTS_SEQUENTIAL="true"
export RUN_UNIT_TESTS="false" export RUN_UNIT_TESTS="false"
export GOAL="install" export GOAL="install"
export PREVIOUS_RELEASES_TO_DOWNLOAD="v0.15.2 v0.16.3 v0.17.2 v0.18.1 v0.19.1" export PREVIOUS_RELEASES_TO_DOWNLOAD="v0.15.2 v0.16.3 v0.17.2 v0.18.1 v0.19.1"
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-c++17 --enable-debug CFLAGS=\"-g0 -O2 -funsigned-char\" CXXFLAGS=\"-g0 -O2 -funsigned-char\" --with-boost-process" export BITCOIN_CONFIG="--enable-zmq --with-libs=no --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-c++17 --enable-debug CFLAGS=\"-g0 -O2 -funsigned-char\" CXXFLAGS=\"-g0 -O2 -funsigned-char\" --with-boost-process"

21
src/test/script_tests.cpp
View file

@ -106,18 +106,18 @@ static ScriptErrorDesc script_errors[]={
static std::string FormatScriptError(ScriptError_t err) static std::string FormatScriptError(ScriptError_t err)
{ {
for (unsigned int i=0; i<ARRAYLEN(script_errors); ++i) for (const auto& se : script_errors)
if (script_errors[i].err == err) if (se.err == err)
return script_errors[i].name; return se.name;
BOOST_ERROR("Unknown scripterror enumeration value, update script_errors in script_tests.cpp."); BOOST_ERROR("Unknown scripterror enumeration value, update script_errors in script_tests.cpp.");
return ""; return "";
} }
static ScriptError_t ParseScriptError(const std::string &name) static ScriptError_t ParseScriptError(const std::string& name)
{ {
for (unsigned int i=0; i<ARRAYLEN(script_errors); ++i) for (const auto& se : script_errors)
if (script_errors[i].name == name) if (se.name == name)
return script_errors[i].err; return se.err;
BOOST_ERROR("Unknown scripterror \"" << name << "\" in test description"); BOOST_ERROR("Unknown scripterror \"" << name << "\" in test description");
return SCRIPT_ERR_UNKNOWN_ERROR; return SCRIPT_ERR_UNKNOWN_ERROR;
} }
@ -1470,8 +1470,6 @@ BOOST_AUTO_TEST_CASE(script_HasValidOps)
BOOST_CHECK(!script.HasValidOps()); BOOST_CHECK(!script.HasValidOps());
} }
#if defined(HAVE_CONSENSUS_LIB)
static CMutableTransaction TxFromHex(const std::string& str) static CMutableTransaction TxFromHex(const std::string& str)
{ {
CMutableTransaction tx; CMutableTransaction tx;
@ -1502,6 +1500,8 @@ static CScriptWitness ScriptWitnessFromJSON(const UniValue& univalue)
return scriptwitness; return scriptwitness;
} }
#if defined(HAVE_CONSENSUS_LIB)
/* Test simple (successful) usage of bitcoinconsensus_verify_script */ /* Test simple (successful) usage of bitcoinconsensus_verify_script */
BOOST_AUTO_TEST_CASE(bitcoinconsensus_verify_script_returns_true) BOOST_AUTO_TEST_CASE(bitcoinconsensus_verify_script_returns_true)
{ {
@ -1640,6 +1640,8 @@ BOOST_AUTO_TEST_CASE(bitcoinconsensus_verify_script_invalid_flags)
BOOST_CHECK_EQUAL(err, bitcoinconsensus_ERR_INVALID_FLAGS); BOOST_CHECK_EQUAL(err, bitcoinconsensus_ERR_INVALID_FLAGS);
} }
#endif // defined(HAVE_CONSENSUS_LIB)
static std::vector<unsigned int> AllConsensusFlags() static std::vector<unsigned int> AllConsensusFlags()
{ {
std::vector<unsigned int> ret; std::vector<unsigned int> ret;
@ -1742,5 +1744,4 @@ BOOST_AUTO_TEST_CASE(script_assets_test)
file.close(); file.close();
} }
#endif
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()