Update libloadorder to 14.2.1

loot · Aug 22, 2023 · 6f93193 · 6f93193
1 parent c6bc726
commit 6f93193
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -98,8 +98,8 @@ endif()
 
 ExternalProject_Add(libloadorder
     PREFIX "external"
-    URL "https://github.com/Ortham/libloadorder/archive/14.2.0.tar.gz"
-    URL_HASH "SHA256=247969e3fb67ad0a883ac81ac52a4258ee92b8417d11f45308cc23ccc0d61b36"
+    URL "https://github.com/Ortham/libloadorder/archive/14.2.1.tar.gz"
+    URL_HASH "SHA256=4341844407f55ce9d96826a933ac35dfb22bbad14906e5dff742f910182eca93"
     CONFIGURE_COMMAND ""
     BUILD_IN_SOURCE 1
     BUILD_COMMAND cargo build --release --manifest-path ffi/Cargo.toml --target ${RUST_TARGET} &&

diff --git a/src/tests/common_game_test_fixture.h b/src/tests/common_game_test_fixture.h
@@ -201,7 +201,7 @@ class CommonGameTestFixture : public ::testing::TestWithParam<GameType> {
           actual.push_back(line);
       }
     } else {
-      actual = readFileLines(localPath / "plugins.txt");
+      actual = readFileLines(localPath / pluginsTxtName(GetParam()));
       for (auto& line : actual) {
         if (line[0] == '*')
           line = line.substr(1);
@@ -320,7 +320,7 @@ class CommonGameTestFixture : public ::testing::TestWithParam<GameType> {
         }
       }
     } else {
-      std::ofstream out(localPath / "plugins.txt");
+      std::ofstream out(localPath / pluginsTxtName(GetParam()));
       for (const auto& plugin : loadOrder) {
         if (GetParam() == GameType::fo4 || GetParam() == GameType::tes5se) {
           if (plugin.second)
@@ -357,6 +357,10 @@ class CommonGameTestFixture : public ::testing::TestWithParam<GameType> {
     return gameType == GameType::tes3 || gameType == GameType::tes4 ||
            gameType == GameType::fo3 || gameType == GameType::fonv;
   }
+
+  static std::string pluginsTxtName(GameType gameType) {
+    return gameType == GameType::tes4 ? "Plugins.txt" : "plugins.txt";
+  }
 };
 }
 }