more adapting to out-of-tree builds

Author: graydon

src/herder/test/TxSetTests.cpp

@@ -2260,16 +2260,10 @@ TEST_CASE("txset nomination", "[txset]")
         {
             runIteration();
         }
-        namespace fs = std::filesystem;
-        fs::path resultsPath = "testdata/txset/" + testName;
-        char* srcdir = getenv("top_srcdir");
-        if (srcdir)
-        {
-            resultsPath = fs::path(srcdir) / "src" / resultsPath;
-        }
+        auto resultsPath = getTestDataPath(testName);
         if (getenv("GENERATE_TEST_TXSETS"))
         {
-            fs::create_directories(resultsPath.parent_path());
+            std::filesystem::create_directories(resultsPath.parent_path());
             std::ofstream resultsStream(resultsPath);
             for (auto const& result : testResults)
             {

src/history/test/SerializeTests.cpp

@@ -4,6 +4,7 @@
 
 #include "history/HistoryArchive.h"
 #include "test/Catch2.h"
+#include "test/test.h"
 
 #include <fstream>
 #include <string>
@@ -19,9 +20,8 @@ TEST_CASE("Serialization round trip", "[history]")
         "stellar-history.testnet.6714239.networkPassphrase.v2.json"};
     for (size_t i = 0; i < testFiles.size(); i++)
     {
-        std::string fnPath = "testdata/";
-        std::string testFilePath = fnPath + testFiles[i];
-        SECTION("Serialize " + testFilePath)
+        auto testFilePath = getTestDataPath(testFiles[i]);
+        SECTION("Serialize " + testFilePath.string())
         {
             std::ifstream in(testFilePath);
             REQUIRE(in);

src/ledger/test/LedgerCloseMetaStreamTests.cpp

@@ -515,13 +515,11 @@ TEST_CASE_VERSIONS("meta stream contains reasonable meta", "[ledgerclosemeta]")
 
             if (ledgerSeq == targetSeq)
             {
-                std::string refJsonPath;
-                refJsonPath = fmt::format(
-                    FMT_STRING(
-                        "testdata/ledger-close-meta{}-v{}-protocol-{}{}.json"),
+                auto refJsonPath = getTestDataPath(fmt::format(
+                    FMT_STRING("ledger-close-meta{}-v{}-protocol-{}{}.json"),
                     enableClassicEvents ? "-enable-classic-events" : "",
                     lcm.v(), cfg.TESTING_UPGRADE_LEDGER_PROTOCOL_VERSION,
-                    isSoroban ? "-soroban" : "");
+                    isSoroban ? "-soroban" : ""));
                 normalizeMeta(lcm);
                 std::string have = xdrToCerealString(lcm, "LedgerCloseMeta");
                 if (getenv("GENERATE_TEST_LEDGER_CLOSE_META"))

src/main/test/ApplicationUtilsTests.cpp

@@ -173,13 +173,7 @@ TEST_CASE("application major version numbers", "[applicationutils]")
 TEST_CASE("standalone quorum intersection check", "[applicationutils]")
 {
     Config cfg = getTestConfig();
-    namespace fs = std::filesystem;
-    fs::path JSON_ROOT = "testdata/check-quorum-intersection-json";
-    char* srcdir = getenv("top_srcdir");
-    if (srcdir)
-    {
-        JSON_ROOT = fs::path(srcdir) / "src" / JSON_ROOT;
-    }
+    auto JSON_ROOT = getTestDataPath("check-quorum-intersection-json");
 
     SECTION("enjoys quorum intersection")
     {

src/main/test/ConfigTests.cpp

@@ -147,7 +147,7 @@ TEST_CASE("resolve node id", "[config]")
 TEST_CASE("load validators config", "[config]")
 {
     Config c;
-    c.load("testdata/stellar-core_example_validators.cfg");
+    c.load(getTestDataPath("stellar-core_example_validators.cfg"));
     auto actualS = c.toString(c.QUORUM_SET);
     std::string expected = R"({
    "t" : 4,
@@ -456,9 +456,8 @@ TEST_CASE("load example configs", "[config]")
         "stellar-core_testnet_validator.cfg"};
     for (auto const& fn : testFiles)
     {
-        std::string fnPath = "testdata/";
-        fnPath += fn;
-        SECTION("load config " + fnPath)
+        auto fnPath = getTestDataPath(fn);
+        SECTION("load config " + fnPath.string())
         {
             c.load(fnPath);
         }
@@ -628,4 +627,4 @@ PUBLIC_KEY="GBVZFVEARURUJTN5ABZPKW36FHKVJK2GHXEVY2SZCCNU5I3CQMTZ3OES"
 )";
     std::stringstream ss(configStr);
     c.load(ss);
-}
+}

src/test/test.cpp

@@ -337,6 +337,19 @@ getTestConfig(int instanceNumber, Config::TestDbMode mode)
     return *cfgs[instanceNumber];
 }
 
+std::filesystem::path
+getTestDataPath(std::filesystem::path rel)
+{
+    namespace fs = std::filesystem;
+    fs::path testdata("testdata");
+    char* srcdir = getenv("top_srcdir");
+    if (srcdir)
+    {
+        testdata = fs::path(srcdir) / "src" / testdata;
+    }
+    return testdata / rel;
+}
+
 int
 runTest(CommandLineArgs const& args)
 {

src/test/test.h

@@ -19,6 +19,8 @@ struct TransactionMeta;
 Config const& getTestConfig(int instanceNumber = 0,
                             Config::TestDbMode mode = Config::TESTDB_DEFAULT);
 
+std::filesystem::path getTestDataPath(std::filesystem::path rel);
+
 void cleanupTmpDirs();
 
 // Records or checks a TxMetadata value against a persistent record