Hot reload: move test/* entries one level up

Author: Bromeon

.github/workflows/full-ci.yml

@@ -410,7 +410,7 @@ jobs:
 
       - name: "Build and test hot-reload"
         if: ${{ matrix.with-hot-reload }}
-        working-directory: itest/hot-reload/godot/test
+        working-directory: itest/hot-reload/godot
         # Repeat a few times, our hot reload integration test can sometimes be a bit flaky.
         run: $RETRY ./run-test.sh
         shell: bash

.github/workflows/minimal-ci.yml

@@ -226,7 +226,7 @@ jobs:
 
       - name: "Build and test hot-reload"
         if: ${{ matrix.with-hot-reload }}
-        working-directory: itest/hot-reload/godot/test
+        working-directory: itest/hot-reload/godot
         run: ./run-test.sh
         shell: bash
 

itest/hot-reload/godot/MainScene.tscn

@@ -1,3 +1,6 @@
-[gd_scene format=3 uid="uid://da7eiv1notj7j"]
+[gd_scene load_steps=2 format=3 uid="uid://da7eiv1notj7j"]
 
-[node name="Reloadable" type="Reloadable"]
+[ext_resource type="Script" path="res://ReloadTest.gd" id="1_6hpr0"]
+
+[node name="MainScene" type="Node"]
+script = ExtResource("1_6hpr0")

itest/hot-reload/godot/test/ReloadOrchestrator.gd renamed to itest/hot-reload/godot/ReloadOrchestrator.gd

@@ -29,7 +29,7 @@ func _initialize():
 
 		["replace"]:
 			print("[GD Orch]   Replace source code...")
-			ok = replace_line("../../rust/src/lib.rs")
+			ok = replace_line("../rust/src/lib.rs")
 
 		["notify"]:
 			print("[GD Orch]   Notify Godot about change...")

itest/hot-reload/godot/test/ReloadOrchestrator.gd.uid renamed to itest/hot-reload/godot/ReloadOrchestrator.gd.uid

@@ -11,4 +11,4 @@ config_version=5
 [application]
 
 config/name="hot-reload"
-config/features=PackedStringArray("4.3", "Forward Plus")
+config/features=PackedStringArray("4.2", "Forward Plus")

itest/hot-reload/godot/test/ReloadTest.gd renamed to itest/hot-reload/godot/ReloadTest.gd

@@ -4,13 +4,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+rel="."
+
 # Restore un-reloaded files on exit (for local testing).
 cleanedUp=0 # avoid recursion if cleanup fails
 cleanup() {
   if [[ $cleanedUp -eq 0 ]]; then
     cleanedUp=1
     echo "[Bash]      Cleanup..."
-    git checkout --quiet ../../rust/src/lib.rs ../rust.gdextension ../MainScene.tscn || true # ignore errors here
+    git checkout --quiet $rel/../rust/src/lib.rs $rel/rust.gdextension $rel/MainScene.tscn || true # ignore errors here
   fi
 }
 
@@ -20,12 +22,12 @@ trap cleanup EXIT
 echo "[Bash]      Start hot-reload integration test..."
 
 # Restore un-reloaded file (for local testing).
-git checkout --quiet ../../rust/src/lib.rs ../rust.gdextension
+git checkout --quiet $rel/../rust/src/lib.rs $rel/rust.gdextension
 
 # Set up editor file which has scene open, so @tool script loads at startup. Also copy scene file that holds a script.
-mkdir -p ../.godot/editor
-cp editor_layout.cfg ../.godot/editor/editor_layout.cfg
-cp MainScene.tscn ../MainScene.tscn
+mkdir -p $rel/.godot/editor
+cp editor_layout.cfg $rel/.godot/editor/editor_layout.cfg
+cp MainScene.tscn $rel/MainScene.tscn
 
 # Compile original Rust source.
 cargoArgs=""
@@ -35,7 +37,7 @@ cargo build -p hot-reload $cargoArgs
 # Wait briefly so artifacts are present on file system.
 sleep 0.5
 
-$GODOT4_BIN -e --headless --path .. &
+$GODOT4_BIN -e --headless --path $rel &
 pid=$!
 echo "[Bash]      Wait for Godot ready (PID $pid)..."