diff --git a/src/beast/extras/beast/unit_test/suite.hpp b/src/beast/extras/beast/unit_test/suite.hpp index 90183e95b..c4e0cf26c 100644 --- a/src/beast/extras/beast/unit_test/suite.hpp +++ b/src/beast/extras/beast/unit_test/suite.hpp @@ -670,6 +670,11 @@ run(runner& r) @endcode The macro invocation must appear in the same namespace as the test class. + + Unit test priorities were introduced so parallel unit_test::suites would + execute faster. Suites with longer running times have higher priorities + than unit tests with shorter running times. Suites with no priorities + are assumed to run most quickly, so they run last. */ #if BEAST_NO_UNIT_TEST_INLINE diff --git a/src/test/app/AccountDelete_test.cpp b/src/test/app/AccountDelete_test.cpp index 75d475c2c..db2ac5799 100644 --- a/src/test/app/AccountDelete_test.cpp +++ b/src/test/app/AccountDelete_test.cpp @@ -924,7 +924,7 @@ public: } }; -BEAST_DEFINE_TESTSUITE(AccountDelete, app, ripple); +BEAST_DEFINE_TESTSUITE_PRIO(AccountDelete, app, ripple, 2); } // namespace test } // namespace ripple diff --git a/src/test/app/LedgerReplay_test.cpp b/src/test/app/LedgerReplay_test.cpp index 3ba3db298..7e1ecf902 100644 --- a/src/test/app/LedgerReplay_test.cpp +++ b/src/test/app/LedgerReplay_test.cpp @@ -1572,7 +1572,7 @@ struct LedgerReplayerLong_test : public beast::unit_test::suite }; BEAST_DEFINE_TESTSUITE(LedgerReplay, app, ripple); -BEAST_DEFINE_TESTSUITE(LedgerReplayer, app, ripple); +BEAST_DEFINE_TESTSUITE_PRIO(LedgerReplayer, app, ripple, 1); BEAST_DEFINE_TESTSUITE(LedgerReplayerTimeout, app, ripple); BEAST_DEFINE_TESTSUITE_MANUAL(LedgerReplayerLong, app, ripple); diff --git a/src/test/app/TheoreticalQuality_test.cpp b/src/test/app/TheoreticalQuality_test.cpp index 70eaa2cd9..d345b8cc1 100644 --- a/src/test/app/TheoreticalQuality_test.cpp +++ b/src/test/app/TheoreticalQuality_test.cpp @@ -549,7 +549,7 @@ public: } }; -BEAST_DEFINE_TESTSUITE(TheoreticalQuality, app, ripple); +BEAST_DEFINE_TESTSUITE_PRIO(TheoreticalQuality, app, ripple, 3); } // namespace test } // namespace ripple diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp index 72ab5eb43..e67f3ba32 100644 --- a/src/test/app/TrustAndBalance_test.cpp +++ b/src/test/app/TrustAndBalance_test.cpp @@ -505,6 +505,6 @@ public: } }; -BEAST_DEFINE_TESTSUITE_PRIO(TrustAndBalance, app, ripple, 1); +BEAST_DEFINE_TESTSUITE(TrustAndBalance, app, ripple); } // namespace ripple diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp index 56626f925..cfae40fd8 100644 --- a/src/test/app/ValidatorSite_test.cpp +++ b/src/test/app/ValidatorSite_test.cpp @@ -659,7 +659,7 @@ public: } }; -BEAST_DEFINE_TESTSUITE(ValidatorSite, app, ripple); +BEAST_DEFINE_TESTSUITE_PRIO(ValidatorSite, app, ripple, 2); } // namespace test } // namespace ripple diff --git a/src/test/consensus/NegativeUNL_test.cpp b/src/test/consensus/NegativeUNL_test.cpp index 59b0c5682..39028afff 100644 --- a/src/test/consensus/NegativeUNL_test.cpp +++ b/src/test/consensus/NegativeUNL_test.cpp @@ -1997,14 +1997,14 @@ BEAST_DEFINE_TESTSUITE(NegativeUNLNoAmendment, ledger, ripple); BEAST_DEFINE_TESTSUITE(NegativeUNLVoteInternal, consensus, ripple); BEAST_DEFINE_TESTSUITE_MANUAL(NegativeUNLVoteScoreTable, consensus, ripple); BEAST_DEFINE_TESTSUITE_PRIO(NegativeUNLVoteGoodScore, consensus, ripple, 1); -BEAST_DEFINE_TESTSUITE_PRIO(NegativeUNLVoteOffline, consensus, ripple, 1); -BEAST_DEFINE_TESTSUITE_PRIO(NegativeUNLVoteMaxListed, consensus, ripple, 1); +BEAST_DEFINE_TESTSUITE(NegativeUNLVoteOffline, consensus, ripple); +BEAST_DEFINE_TESTSUITE(NegativeUNLVoteMaxListed, consensus, ripple); BEAST_DEFINE_TESTSUITE_PRIO( NegativeUNLVoteRetiredValidator, consensus, ripple, 1); -BEAST_DEFINE_TESTSUITE_PRIO(NegativeUNLVoteNewValidator, consensus, ripple, 1); +BEAST_DEFINE_TESTSUITE(NegativeUNLVoteNewValidator, consensus, ripple); BEAST_DEFINE_TESTSUITE(NegativeUNLVoteFilterValidations, consensus, ripple); BEAST_DEFINE_TESTSUITE(NegativeUNLgRPC, ledger, ripple); diff --git a/src/test/rpc/AccountSet_test.cpp b/src/test/rpc/AccountSet_test.cpp index 23716b665..a125f318c 100644 --- a/src/test/rpc/AccountSet_test.cpp +++ b/src/test/rpc/AccountSet_test.cpp @@ -555,6 +555,6 @@ public: } }; -BEAST_DEFINE_TESTSUITE(AccountSet, app, ripple); +BEAST_DEFINE_TESTSUITE_PRIO(AccountSet, app, ripple, 1); } // namespace ripple diff --git a/src/test/rpc/ReportingETL_test.cpp b/src/test/rpc/ReportingETL_test.cpp index cbb484ea4..a1f2c4f64 100644 --- a/src/test/rpc/ReportingETL_test.cpp +++ b/src/test/rpc/ReportingETL_test.cpp @@ -1031,7 +1031,7 @@ public: } }; -BEAST_DEFINE_TESTSUITE(ReportingETL, app, ripple); +BEAST_DEFINE_TESTSUITE_PRIO(ReportingETL, app, ripple, 2); } // namespace test } // namespace ripple diff --git a/src/test/rpc/ShardArchiveHandler_test.cpp b/src/test/rpc/ShardArchiveHandler_test.cpp index 70b60b3b6..296699b3c 100644 --- a/src/test/rpc/ShardArchiveHandler_test.cpp +++ b/src/test/rpc/ShardArchiveHandler_test.cpp @@ -696,7 +696,7 @@ public: } }; -BEAST_DEFINE_TESTSUITE(ShardArchiveHandler, app, ripple); +BEAST_DEFINE_TESTSUITE_PRIO(ShardArchiveHandler, app, ripple, 3); } // namespace test } // namespace ripple