only load the test scenarios when we're in test mode

data/_main.cfg

@@ -15,11 +15,15 @@
     name="wesnoth-editor"
 [/textdomain]
 #endif
+
+#ifdef TEST
 {scenario-test.cfg}
 {scenario-formula.cfg}
 {scenario-formula-recruitment.cfg}
 {scenario-poisoning.cfg}
 {ai/scenarios/scenario-AI_Arena_small.cfg}
+#endif
+
 [textdomain]
     name="wesnoth"
 [/textdomain]

src/game.cpp

@@ -649,14 +649,11 @@ bool game_controller::play_test()
 
 	state_.campaign_type = "test";
 	state_.scenario = test_scenario_;
+	state_.campaign_define = "TEST";
+	cache_.clear_defines();
+	cache_.add_define("TEST");
 
-	try {
-		load_game_cfg();
-	} catch(config::error&) {
-		cache_.clear_defines();
-		load_game_cfg();
-		return false;
-	}
+	load_game_cfg();
 
 	try {
 		upload_log nolog(false);