From 612685636040fb5ad85eeaed5a780221bcd85599 Mon Sep 17 00:00:00 2001
From: GsLogimaker <gslogimaker@gmail.com>
Date: Thu, 26 Sep 2024 17:41:25 +0000
Subject: [PATCH] Remove cpp branch from unittests.yml triggers

---
 .github/workflows/unittests.yml |  4 ++--
 main.gd                         | 33 ++++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index be97293..515e262 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -3,9 +3,9 @@ name: Build Process
 
 on:
   push:
-    branches: [ "dev", "cpp" ]
+    branches: [ "dev" ]
   pull_request:
-    branches: [ "dev", "cpp" ]
+    branches: [ "dev" ]
   workflow_dispatch:
 
 jobs:
diff --git a/main.gd b/main.gd
index 816ce04..4cde5dc 100644
--- a/main.gd
+++ b/main.gd
@@ -1,38 +1,45 @@
 
 extends Control
 
-const GutConfig:= preload('res://addons/gut/gut_config.gd')
-const GutEditorGlobals:= preload('res://addons/gut/gui/editor_globals.gd')
+const GlecsTestRunner:= preload("res://glecs_tests_runner.gd")
 
+var thread:= Thread.new()
 var mutex:= Mutex.new()
 
 var world:= GFWorld.new()
 
-var gut_runner:= preload("res://addons/gut/gui/GutRunner.tscn").instantiate()
-var gut_config:GutConfig= GutConfig.new()
+var test_runner:GlecsTestRunner = null
 
 func _enter_tree() -> void:
-	gut_config.load_options(GutEditorGlobals.editor_run_gut_config_path)
-	gut_runner.ran_from_editor = false
-	gut_runner.set_gut_config(gut_config)
-	add_child(gut_runner)
+	test_runner = preload("res://glecs_tests_runner.tscn").instantiate()
+	test_runner.exit_on_test_completion = false
+	add_child(test_runner)
+
+func _exit_tree() -> void:
+	if thread.is_started():
+		thread.wait_to_finish()
+	world.free()
 
 func _ready() -> void:
 	world.start_rest_api()
 
+	if "--unittests" in  OS.get_cmdline_args() or "--unittest" in  OS.get_cmdline_args():
+		prints("--- Running Glecs unittests ---")
+		test_runner.run_tests()
+		return
+
 	prints("Input ready")
-	var thread:= Thread.new()
 	thread.start(func():
-	##(func():
 		while true:
+			prints(is_queued_for_deletion())
+			if is_queued_for_deletion():
+				return
 			var stdin:= OS.read_string_from_stdin().strip_edges()
 			var args:= stdin.split(" ")
 			if args[0] in ["exit", "quit", "close", "continue"]:
 				break
 			if args[0] in ["test"]:
-				gut_config.options.tests = [args[1]] if args.size() > 1 else []
-				gut_config.options.unit_test_name = args[2] if args.size() > 2 else ""
-				gut_runner.run_tests.call_deferred()
+				test_runner.run_tests.call_deferred()
 				continue
 			if args[0] in ["reset"]:
 				get_tree().change_scene_to_file.call_deferred("res://main.tscn")