Merge pull request #40661 from RevoluPowered/fix_argument_edit_doctes…

…t_pr Fix godot not starting
godotengine · Jul 24, 2020 · 5287124 · 5287124
2 parents 3f1fc5a + a55b10a
commit 5287124
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/main/main.cpp b/main/main.cpp
@@ -397,16 +397,17 @@ void Main::print_help(const char *p_binary) {
 
 int Main::test_entrypoint(int argc, char *argv[], bool &tests_need_run) {
 #ifdef TOOLS_ENABLED // templates can't run unit test tool
- OS::get_singleton()->initialize();
- StringName::setup();
  for (int x = 0; x < argc; x++) {
- if (strncmp(argv[x], "--test", 6)) {
+ if (strncmp(argv[x], "--test", 6) == 0) {
  tests_need_run = true;
- return test_main(argc, argv);
+ OS::get_singleton()->initialize();
+ StringName::setup();
+ int status = test_main(argc, argv);
+ StringName::cleanup();
+ // TODO: fix OS::singleton cleanup
+ return status;
  }
  }
- StringName::cleanup();
- OS::get_singleton()->finalize();
 #endif
  tests_need_run = false;
  return 0;
@@ -1829,15 +1830,15 @@ bool Main::start() {
  print_line("Generating new docs...");
  doc.save_classes(index_path, doc_data_classes);
 
- return FAILED;
+ return false;
  }
 
  if (_export_preset != "") {
  if (positional_arg == "") {
  String err = "Command line includes export parameter option, but no destination path was given.\n";
  err += "Please specify the binary's file path to export to. Aborting export.";
  ERR_PRINT(err);
- return FAILED;
+ return false;
  }
  }
 #endif
@@ -1859,7 +1860,7 @@ bool Main::start() {
  if (!script_res->is_valid()) {
  OS::get_singleton()->set_exit_code(1);
  }
- return FAILED;
+ return false;
  }
 
  if (script_res->can_instance()) {
@@ -1878,7 +1879,7 @@ bool Main::start() {
  script_loop->set_init_script(script_res);
  main_loop = script_loop;
  } else {
- return FAILED;
+ return false;
  }
 
  } else {
@@ -1892,7 +1893,7 @@ bool Main::start() {
  if (!main_loop) {
  if (!ClassDB::class_exists(main_loop_type)) {
  DisplayServer::get_singleton()->alert("Error: MainLoop type doesn't exist: " + main_loop_type);
- return FAILED;
+ return false;
  } else {
  Object *ml = ClassDB::instance(main_loop_type);
  ERR_FAIL_COND_V_MSG(!ml, false, "Can't instance MainLoop type.");
@@ -2251,7 +2252,7 @@ bool Main::start() {
 
  OS::get_singleton()->set_main_loop(main_loop);
 
- return OK;
+ return true;
 }
 
 /* Main iteration