[Scummvm-cvs-logs] SF.net SVN: scummvm:[51840] scummvm/branches/gsoc2010-testbed/engines/ testbed
sud03r at users.sourceforge.net
sud03r at users.sourceforge.net
Sat Aug 7 22:35:50 CEST 2010
Revision: 51840
http://scummvm.svn.sourceforge.net/scummvm/?rev=51840&view=rev
Author: sud03r
Date: 2010-08-07 20:35:50 +0000 (Sat, 07 Aug 2010)
Log Message:
-----------
TESTBED: fixed default disabling of FS testsuite when game data files are not found
Modified Paths:
--------------
scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp
scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp
scummvm/branches/gsoc2010-testbed/engines/testbed/fs.h
scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.cpp
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp 2010-08-07 20:32:00 UTC (rev 51839)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp 2010-08-07 20:35:50 UTC (rev 51840)
@@ -78,12 +78,18 @@
case GUI::kListItemDoubleClickedCmd:
ts = _testSuiteArray[_testListDisplay->getSelected()];
if (ts) {
+ // Toggle status
if (ts->isEnabled()) {
ts->enable(false);
- _testListDisplay->markAsDeselected(_testListDisplay->getSelected());
} else {
ts->enable(true);
+ }
+
+ // Now render status
+ if (ts->isEnabled()) {
_testListDisplay->markAsSelected(_testListDisplay->getSelected());
+ } else {
+ _testListDisplay->markAsDeselected(_testListDisplay->getSelected());
}
}
break;
@@ -181,7 +187,6 @@
}
}
_configFileInterface.saveToStream(*ws);
- _configFileInterface.clear();
ws->flush();
}
@@ -287,6 +292,9 @@
TestbedOptionsDialog tbd(_testsuiteList, this);
tbd.runModal();
}
+
+ // Clear it to remove entries before next rerun
+ _configFileInterface.clear();
}
} // End of namespace Testbed
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp 2010-08-07 20:32:00 UTC (rev 51839)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp 2010-08-07 20:35:50 UTC (rev 51840)
@@ -149,21 +149,23 @@
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
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/fs.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/fs.h 2010-08-07 20:32:00 UTC (rev 51839)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/fs.h 2010-08-07 20:35:50 UTC (rev 51840)
@@ -67,6 +67,9 @@
return "File system tests (Navigation, Read/Write)";
}
void enable(bool flag);
+
+private:
+ bool _isGameDataFound;
};
} // End of namespace Testbed
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.cpp 2010-08-07 20:32:00 UTC (rev 51839)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.cpp 2010-08-07 20:35:50 UTC (rev 51840)
@@ -93,6 +93,7 @@
if (_ws) {
_ws->writeString(buffer);
+ _ws->flush();
debugCN(kTestbedLogOutput, "%s", buffer);
} else {
debugCN(kTestbedLogOutput, "%s", buffer);
@@ -110,6 +111,7 @@
if (_ws) {
_ws->writeString(buffer);
+ _ws->flush();
debugCN(1, kTestbedLogOutput, "%s", buffer);
} else {
debugCN(1, kTestbedLogOutput, "%s", buffer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list