Issue #101 unit test (should fail)

.github/workflows/ci.yml

@@ -58,7 +58,7 @@
 				},
 				{
 					name: build and unit test,
-					run: ./.github/workflows/scripts/mac/scons-build.sh
+					run: ./.github/workflows/scripts/mac/scons-build.sh test=true
 				}
 			]
 		},
@@ -153,7 +153,7 @@
 				},
 				{
 					name: build and unit test,
-					run: '.\.github\workflows\scripts\win\scons-build.bat'
+					run: '.\.github\workflows\scripts\win\scons-build.bat test=true'
 				},
 				{
 					name: warn about failure to launch tests,

src/fileio/fileio.hpp

@@ -19,7 +19,7 @@ class cScenario;
 class cUniverse;
 
 fs::path locate_scenario(std::string scen_name);
-bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header = false);
+bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header = false, bool pop_paths = true);
 
 fs::path nav_get_or_decode_party();
 fs::path nav_put_or_temp_party(fs::path def = "");

src/fileio/fileio_scen.cpp

@@ -100,20 +100,22 @@ fs::path locate_scenario(std::string scen_name) {
 	return scenPath;
 }
 
-bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header) {
+bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header, bool pop_paths) {
 	// Before loading a scenario, we may need to pop scenario resource paths.
-	fs::path graphics_path = ResMgr::graphics.popPath();
-	for(auto p : graphics_path) {
-		if(p.string() == "data") {
-			ResMgr::graphics.pushPath(graphics_path);
-			break;
+	if(pop_paths){
+		fs::path graphics_path = ResMgr::graphics.popPath();
+		for(auto p : graphics_path) {
+			if(p.string() == "data") {
+				ResMgr::graphics.pushPath(graphics_path);
+				break;
+			}
 		}
-	}
-	fs::path sounds_path = ResMgr::sounds.popPath();
-	for(auto p : sounds_path) {
-		if(p.string() == "data") {
-			ResMgr::sounds.pushPath(sounds_path);
-			break;
+		fs::path sounds_path = ResMgr::sounds.popPath();
+		for(auto p : sounds_path) {
+			if(p.string() == "data") {
+				ResMgr::sounds.pushPath(sounds_path);
+				break;
+			}
 		}
 	}
 	scenario = cScenario();

test/SConscript

@@ -42,6 +42,8 @@ env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/strings")))
 env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/dialogs")))
 env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/fonts")))
 env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/graphics")))
+# The town boundaries conversion test requires this:
+env.AlwaysBuild(env.Install("#build/rsrc/", Dir("#rsrc/sounds")))
 
 env.Command("#build/test/junk/", '', 'mkdir "' + Dir("#build/test/junk").path + '"')
 env.Command("#build/test/passed", test, run_tests, chdir=True)