mirror of
https://github.com/luanti-org/luanti.git
synced 2025-10-12 16:15:20 +02:00
Unit tests must be done at integration process.
* Remove --enable-unittests and --disable-unittests and add --do-unittests function * --do-unittests function will exit 0 on success. * minetest and minetestserver binaries are launched with --do-unittests in travis build.
This commit is contained in:
23
src/main.cpp
23
src/main.cpp
@@ -17,19 +17,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifdef NDEBUG
|
||||
/*#ifdef _WIN32
|
||||
#pragma message ("Disabling unit tests")
|
||||
#else
|
||||
#warning "Disabling unit tests"
|
||||
#endif*/
|
||||
// Disable unit tests
|
||||
#define ENABLE_TESTS 0
|
||||
#else
|
||||
// Enable unit tests
|
||||
#define ENABLE_TESTS 1
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#ifndef SERVER // Dedicated server isn't linked with Irrlicht
|
||||
#pragma comment(lib, "Irrlicht.lib")
|
||||
@@ -279,9 +266,9 @@ int main(int argc, char *argv[])
|
||||
|
||||
#ifndef __ANDROID__
|
||||
// Run unit tests
|
||||
if ((ENABLE_TESTS && cmd_args.getFlag("disable-unittests") == false)
|
||||
|| cmd_args.getFlag("enable-unittests") == true) {
|
||||
if (cmd_args.getFlag("do-unittests")) {
|
||||
run_tests();
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -352,10 +339,8 @@ static void set_allowed_options(OptionList *allowed_options)
|
||||
_("Load configuration from specified file"))));
|
||||
allowed_options->insert(std::make_pair("port", ValueSpec(VALUETYPE_STRING,
|
||||
_("Set network port (UDP)"))));
|
||||
allowed_options->insert(std::make_pair("disable-unittests", ValueSpec(VALUETYPE_FLAG,
|
||||
_("Disable unit tests"))));
|
||||
allowed_options->insert(std::make_pair("enable-unittests", ValueSpec(VALUETYPE_FLAG,
|
||||
_("Enable unit tests"))));
|
||||
allowed_options->insert(std::make_pair("do-unittests", ValueSpec(VALUETYPE_FLAG,
|
||||
_("Run the unit tests and exit"))));
|
||||
allowed_options->insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING,
|
||||
_("Same as --world (deprecated)"))));
|
||||
allowed_options->insert(std::make_pair("world", ValueSpec(VALUETYPE_STRING,
|
||||
|
Reference in New Issue
Block a user