oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Travis: build matrix improvements + CPP11 build

Browse source
This commit is contained in:
Loic Blot 2016-10-05 22:17:22 +02:00 • committed by Ner'zhul
parent 7fab86a49d
commit 61d1751dff
5 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/unittest/test_settings.cpp
View file

@ -32,7 +32,7 @@ public:
void testAllSettings();
static const char *config_text_before;
static const char *config_text_after;
static const std::string config_text_after;
};
static TestSettings g_test_instance;
@ -69,7 +69,7 @@ const char *TestSettings::config_text_before =
"np_terrain = 5, 40, (250, 250, 250), 12341, 5, 0.7, 2.4\n"
"zoop = true";
const char *TestSettings::config_text_after =
const std::string TestSettings::config_text_after =
"leet = 1337\n"
"leetleet = 13371337\n"
"leetleet_neg = -13371337\n"
@ -197,7 +197,10 @@ void TestSettings::testAllSettings()
UASSERT(s.updateConfigObject(is, os, "", 0) == true);
//printf(">>>> expected config:\n%s\n", TEST_CONFIG_TEXT_AFTER);
//printf(">>>> actual config:\n%s\n", os.str().c_str());
#if __cplusplus < 201103L
// This test only works in older C++ versions than C++11 because we use unordered_map
UASSERT(os.str() == config_text_after);
#endif
} catch (SettingNotFoundException &e) {
UASSERT(!"Setting not found!");
}