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

Rename --do-unittests to --run-unittests as @Zeno- and @sfan5 requested

Browse Source
This commit is contained in:
Loic Blot 2015-02-24 08:56:52 +01:00
parent 577701cabd
commit b4acac706d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@ -266,7 +266,7 @@ int main(int argc, char *argv[])
#ifndef __ANDROID__ #ifndef __ANDROID__
// Run unit tests // Run unit tests
if (cmd_args.getFlag("do-unittests")) { if (cmd_args.getFlag("run-unittests")) {
run_tests(); run_tests();
return 0; return 0;
} }
@ -339,7 +339,7 @@ static void set_allowed_options(OptionList *allowed_options)
_("Load configuration from specified file")))); _("Load configuration from specified file"))));
allowed_options->insert(std::make_pair("port", ValueSpec(VALUETYPE_STRING, allowed_options->insert(std::make_pair("port", ValueSpec(VALUETYPE_STRING,
_("Set network port (UDP)")))); _("Set network port (UDP)"))));
allowed_options->insert(std::make_pair("do-unittests", ValueSpec(VALUETYPE_FLAG, allowed_options->insert(std::make_pair("run-unittests", ValueSpec(VALUETYPE_FLAG,
_("Run the unit tests and exit")))); _("Run the unit tests and exit"))));
allowed_options->insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING, allowed_options->insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING,
_("Same as --world (deprecated)")))); _("Same as --world (deprecated)"))));

4
util/travis/script.sh
View File

@ -6,9 +6,9 @@ if [ $WINDOWS = "no" ]; then
cmake -DENABLE_GETTEXT=1 -DENABLE_LEVELDB=1 -DENABLE_REDIS=1 -DCMAKE_BUILD_TYPE=Debug .. cmake -DENABLE_GETTEXT=1 -DENABLE_LEVELDB=1 -DENABLE_REDIS=1 -DCMAKE_BUILD_TYPE=Debug ..
make -j2 make -j2
echo "Running unit tests for minetest" echo "Running unit tests for minetest"
../bin/minetest --do-unittests ../bin/minetest --run-unittests
echo "Running unit tests for minetestserver" echo "Running unit tests for minetestserver"
../bin/minetestserver --do-unittests ../bin/minetestserver --run-unittests
else else
[ $CC = "clang" ] && exit 1 # Not supposed to happen [ $CC = "clang" ] && exit 1 # Not supposed to happen
# We need to have our build directory outside of the minetest directory because # We need to have our build directory outside of the minetest directory because