Handle alternate test source/header paths

Make tests resilient to differing repo layouts by adding fallback path checks. In projects_test.v, get_source_dir now checks the new modules/tests/sources/<dir> layout, special-cases psc_deps, and falls back to modules/tests/<dir> before failing. In selective_headers_loading_test.v, header_dir resolution tries modules/tests/sources/psc_deps first then modules/tests/psc_deps, validating that Form.psc exists. These changes improve backward compatibility with submodule or layout changes.

Author: russo-2025

modules/tests/projects_test.v

@@ -17,10 +17,28 @@ fn get_prefs(input_dir string, header_dirs []string, output_dir string) pref.Pre
 }
 
 fn get_source_dir(dir_name string, required_file_name string) string {
-	path := os.abs_path(os.join_path("modules", "tests", "sources", dir_name))
-	required_file := os.join_path(path, required_file_name)
+	// First try with the new submodule structure
+	mut path := os.abs_path(os.join_path("modules", "tests", "sources", dir_name))
+	mut required_file := os.join_path(path, required_file_name)
 
+	// If not found, try original structure (for backward compatibility)
 	if !os.is_dir(path) || !os.is_file(required_file) {
+		// For psc_deps specifically, check if it exists directly under sources
+		if dir_name == "psc_deps" {
+			path = os.abs_path(os.join_path("modules", "tests", "sources", "psc_deps"))
+			required_file = os.join_path(path, required_file_name)
+			if os.is_dir(path) && os.is_file(required_file) {
+				return path
+			}
+		}
+		
+		// Check the old path as a fallback
+		path = os.abs_path(os.join_path("modules", "tests", dir_name))
+		required_file = os.join_path(path, required_file_name)
+		if os.is_dir(path) && os.is_file(required_file) {
+			return path
+		}
+
 		assert false, "[get_source_dir] invalid directory ${path} or missing required file ${required_file}"
 	}
 

modules/tests/selective_headers_loading_test.v

@@ -13,16 +13,22 @@ const placeholder_objects = ["actor", "textureset", "keyword", "magiceffect",
 fn test_selective_headers_loading() {
 	src_file := os.real_path(os.join_path("modules", "tests", "psc", "TestSelectiveLoading.psc"))
 	output_dir := os.real_path(os.join_path("test-files", "compiled"))
-	header_dir := os.real_path(os.join_path("modules", "tests", "sources", "psc_deps"))
-
+	
+	// Try multiple possible locations for the header directory
+	mut header_dir := os.real_path(os.join_path("modules", "tests", "sources", "psc_deps"))
+	
+	// If not found, try the original location
+	if !os.is_dir(header_dir) || !os.is_file(os.join_path(header_dir, "Form.psc")) {
+		header_dir = os.real_path(os.join_path("modules", "tests", "psc_deps"))
+		if !os.is_dir(header_dir) || !os.is_file(os.join_path(header_dir, "Form.psc")) {
+			assert false, "invalid header dir ${header_dir}"
+		}
+	}
+	
 	if !os.is_file(src_file) {
 		assert false, "invalid input file ${src_file}"
 	}
 
-	if !os.is_dir(header_dir) || !os.is_file(os.join_path(header_dir, "Form.psc")) {
-		assert false, "invalid header dir ${header_dir}"
-	}
-
 	if !os.is_dir(output_dir) {
 		os.mkdir(output_dir, os.MkdirParams{}) or { assert false, "failed to create output folder" }
 	}