diff options
author | Neeraj Kumar | 2010-08-09 20:10:53 +0000 |
---|---|---|
committer | Neeraj Kumar | 2010-08-09 20:10:53 +0000 |
commit | 4e92b3a17ea963d3c006c93abd28287e0fac153a (patch) | |
tree | fec5727424608cad49f581c134772b6ac106f722 /engines/testbed/misc.cpp | |
parent | 37d28b35b9b7ed2c71af7ea59b7bc4706412192c (diff) | |
download | scummvm-rg350-4e92b3a17ea963d3c006c93abd28287e0fac153a.tar.gz scummvm-rg350-4e92b3a17ea963d3c006c93abd28287e0fac153a.tar.bz2 scummvm-rg350-4e92b3a17ea963d3c006c93abd28287e0fac153a.zip |
TESTBED: Some refinemnts related to skipping tests and display in GUI
svn-id: r51945
Diffstat (limited to 'engines/testbed/misc.cpp')
-rw-r--r-- | engines/testbed/misc.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/testbed/misc.cpp b/engines/testbed/misc.cpp index 74f0af2948..20813c4228 100644 --- a/engines/testbed/misc.cpp +++ b/engines/testbed/misc.cpp @@ -66,12 +66,12 @@ void MiscTests::criticalSection(void *arg) { g_system->getTimerManager()->removeTimerProc(criticalSection); } -bool MiscTests::testDateTime() { +TestExitStatus MiscTests::testDateTime() { if (Testsuite::isSessionInteractive) { if (Testsuite::handleInteractiveInput("Testing the date time API implementation", "Continue", "Skip", kOptionRight)) { Testsuite::logPrintf("Info! Date time tests skipped by the user.\n"); - return true; + return kTestSkipped; } Testsuite::writeOnScreen("Verifying Date-Time...", Common::Point(0, 100)); @@ -87,7 +87,7 @@ bool MiscTests::testDateTime() { // Directly verify date dateTimeNow = "We expect the current date time to be " + dateTimeNow; if (Testsuite::handleInteractiveInput(dateTimeNow, "Correct!", "Wrong", kOptionRight)) { - return false; + return kTestFailed; } } @@ -105,32 +105,32 @@ bool MiscTests::testDateTime() { if (t1.tm_mon == t2.tm_mon && t1.tm_year == t2.tm_year) { // Ignore lag due to processing time if (t1.tm_sec + 2 == t2.tm_sec) { - return true; + return kTestPassed; } } } - return false; + return kTestFailed; } -bool MiscTests::testTimers() { +TestExitStatus MiscTests::testTimers() { static int valToModify = 0; if (g_system->getTimerManager()->installTimerProc(timerCallback, 100000, &valToModify)) { g_system->delayMillis(150); g_system->getTimerManager()->removeTimerProc(timerCallback); if (999 == valToModify) { - return true; + return kTestPassed; } } - return false; + return kTestFailed; } -bool MiscTests::testMutexes() { +TestExitStatus MiscTests::testMutexes() { if (Testsuite::isSessionInteractive) { if (Testsuite::handleInteractiveInput("Testing the Mutual Exclusion API implementation", "Continue", "Skip", kOptionRight)) { Testsuite::logPrintf("Info! Mutex tests skipped by the user.\n"); - return true; + return kTestSkipped; } Testsuite::writeOnScreen("Installing mutex", Common::Point(0, 100)); } @@ -157,10 +157,10 @@ bool MiscTests::testMutexes() { g_system->deleteMutex(sv.mutex); if (sv.resultSoFar && 6 == sv.second) { - return true; + return kTestPassed; } - return false; + return kTestFailed; } MiscTestSuite::MiscTestSuite() { |