From dab72c519c7aa4ba1e7bc451222e8d0ac3367ac3 Mon Sep 17 00:00:00 2001
From: Neeraj Kumar
Date: Sat, 7 Aug 2010 20:35:50 +0000
Subject: TESTBED: fixed default disabling of FS testsuite when game data files
 are not found

svn-id: r51840
---
 engines/testbed/fs.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'engines/testbed/fs.cpp')

diff --git a/engines/testbed/fs.cpp b/engines/testbed/fs.cpp
index 6bd67022ee..7cae7ef6c1 100644
--- a/engines/testbed/fs.cpp
+++ b/engines/testbed/fs.cpp
@@ -149,21 +149,23 @@ bool FStests::testWriteFile() {
 
 
 FSTestSuite::FSTestSuite() {
-	addTest("ReadingFile", &FStests::testReadFile, false);
-	addTest("WritingFile", &FStests::testWriteFile, false);
-}
-
-void FSTestSuite::enable(bool flag) {
+	// FS tests depend on Game Data files.
+	// If those are not found. Disable this testsuite.
 	const Common::String &path = ConfMan.get("path");
 	Common::FSNode gameRoot(path);
 
 	Common::FSNode gameIdentificationFile = gameRoot.getChild("TESTBED");
 	if (!gameIdentificationFile.exists()) {
 		logPrintf("WARNING! : Game Data not found. Skipping FS tests\n");
+		_isGameDataFound = false;
 		Testsuite::enable(false);
-		return;
 	}
-	Testsuite::enable(flag);
+	addTest("ReadingFile", &FStests::testReadFile, false);
+	addTest("WritingFile", &FStests::testWriteFile, false);
+}
+
+void FSTestSuite::enable(bool flag) {
+	Testsuite::enable(_isGameDataFound & flag);
 }
 
 } // End of namespace Testbed
-- 
cgit v1.2.3