BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Remove broken MINETEST_SUBGAME_PATH test

Browse Source 
The path being tested for is in the default search path for games,
so it would still pass if the env var was not working.
This commit is contained in:
sfan5 2024-01-10 18:51:06 +01:00
parent 45561b89a4
commit 863c9b55b4
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/unittest/test_servermodmanager.cpp
View File

@ -48,20 +48,14 @@ static TestServerModManager g_test_instance;
void TestServerModManager::runTests(IGameDef *gamedef) void TestServerModManager::runTests(IGameDef *gamedef)
{ {
const char *saved_env_mt_subgame_path = getenv("MINETEST_SUBGAME_PATH");
const char *saved_env_mt_mod_path = getenv("MINETEST_MOD_PATH"); const char *saved_env_mt_mod_path = getenv("MINETEST_MOD_PATH");
#ifdef WIN32 #ifdef WIN32
{ {
std::string subgame_path("MINETEST_SUBGAME_PATH=");
subgame_path.append(TEST_SUBGAME_PATH);
_putenv(subgame_path.c_str());
std::string mod_path("MINETEST_MOD_PATH="); std::string mod_path("MINETEST_MOD_PATH=");
mod_path.append(TEST_MOD_PATH); mod_path.append(TEST_MOD_PATH);
_putenv(mod_path.c_str()); _putenv(mod_path.c_str());
} }
#else #else
setenv("MINETEST_SUBGAME_PATH", TEST_SUBGAME_PATH, 1);
setenv("MINETEST_MOD_PATH", TEST_MOD_PATH, 1); setenv("MINETEST_MOD_PATH", TEST_MOD_PATH, 1);
#endif #endif
@ -75,6 +69,7 @@ void TestServerModManager::runTests(IGameDef *gamedef)
TEST(testGetModNames); TEST(testGetModNames);
TEST(testGetModMediaPathsWrongDir); TEST(testGetModMediaPathsWrongDir);
TEST(testGetModMediaPaths); TEST(testGetModMediaPaths);
// TODO: test MINETEST_SUBGAME_PATH
#ifdef WIN32 #ifdef WIN32
{ {
@ -89,10 +84,6 @@ void TestServerModManager::runTests(IGameDef *gamedef)
_putenv(mod_path.c_str()); _putenv(mod_path.c_str());
} }
#else #else
if (saved_env_mt_subgame_path)
setenv("MINETEST_SUBGAME_PATH", saved_env_mt_subgame_path, 1);
else
unsetenv("MINETEST_SUBGAME_PATH");
if (saved_env_mt_mod_path) if (saved_env_mt_mod_path)
setenv("MINETEST_MOD_PATH", saved_env_mt_mod_path, 1); setenv("MINETEST_MOD_PATH", saved_env_mt_mod_path, 1);
else else