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

minetest · Feb 24, 2015 · b4acac7 · b4acac7
1 parent 577701c
commit b4acac7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -266,7 +266,7 @@ int main(int argc, char *argv[])
 
 #ifndef __ANDROID__
 	// Run unit tests
-	if (cmd_args.getFlag("do-unittests")) {
+	if (cmd_args.getFlag("run-unittests")) {
 		run_tests();
 		return 0;
 	}
@@ -339,7 +339,7 @@ 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("do-unittests", ValueSpec(VALUETYPE_FLAG,
+	allowed_options->insert(std::make_pair("run-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)"))));

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