Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation on Windows and avoid crashing when the TestSuite is interrupted.

Browse Source
This commit is contained in:
Xawotihs
2011-11-06 19:58:23 +00:00
parent e50fdba648
commit 1ef9489ea0
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/mtg/include/TestSuiteAI.h
View File

@@ -60,7 +60,7 @@ protected:
bool load(); bool load();
public: public:
~TestSuiteGame(); virtual ~TestSuiteGame();
TestSuiteGame(TestSuite* testsuite); TestSuiteGame(TestSuite* testsuite);
TestSuiteGame(TestSuite* testsuite, string _filename); TestSuiteGame(TestSuite* testsuite, string _filename);
void initGame(); void initGame();
@@ -90,6 +90,7 @@ public:
unsigned int seed; unsigned int seed;
int nbFailed, nbTests, nbAIFailed, nbAITests; int nbFailed, nbTests, nbAIFailed, nbAITests;
TestSuite(const char * filename); TestSuite(const char * filename);
~TestSuite();
void initGame(GameObserver* g); void initGame(GameObserver* g);
void pregameTests(); void pregameTests();
int loadNext(); int loadNext();

4
projects/mtg/include/Trash.h
View File

@@ -7,8 +7,8 @@
#include "DamagerDamaged.h" #include "DamagerDamaged.h"
class CardView; class CardView;
class AttackerDamaged; struct AttackerDamaged;
class DamagerDamaged; struct DamagerDamaged;
typedef DamagerDamaged DefenserDamaged; typedef DamagerDamaged DefenserDamaged;
template<class T> void trash(T*); template<class T> void trash(T*);

37
projects/mtg/src/TestSuiteAI.cpp
View File

@@ -447,11 +447,23 @@ void TestSuite::handleResults(bool wasAI, int error)
} }
} }
TestSuite::~TestSuite()
{
mProcessing = false;
while(mWorkerThread.size())
{
mWorkerThread.back().join();
mWorkerThread.pop_back();
}
observer = 0;
}
TestSuite::TestSuite(const char * filename) TestSuite::TestSuite(const char * filename)
: TestSuiteGame(this), mRules(0), mProcessing(false) : TestSuiteGame(0), mRules(0), mProcessing(false)
{ {
timerLimit = 0; timerLimit = 0;
testsuite = this;
std::string s; std::string s;
nbfiles = 0; nbfiles = 0;
@@ -731,25 +743,20 @@ void TestSuite::ThreadProc(void* inParam)
{ {
string filename; string filename;
float counter = 1.0f; float counter = 1.0f;
// while(instance->mProcessing) while(instance->mProcessing && (filename = instance->getNextFile()) != "")
{ {
while((filename = instance->getNextFile()) != "") TestSuiteGame theGame(instance, filename);
if(theGame.isOK)
{ {
TestSuiteGame theGame(instance, filename); theGame.observer->loadTestSuitePlayer(0, &theGame);
if(theGame.isOK) theGame.observer->loadTestSuitePlayer(1, &theGame);
{
theGame.observer->loadTestSuitePlayer(0, &theGame);
theGame.observer->loadTestSuitePlayer(1, &theGame);
theGame.observer->startGame(theGame.gameType, instance->mRules); theGame.observer->startGame(theGame.gameType, instance->mRules);
theGame.initGame(); theGame.initGame();
while(!theGame.observer->gameOver) while(!theGame.observer->gameOver)
theGame.observer->Update(counter++); theGame.observer->Update(counter++);
}
} }
boost::this_thread::sleep(100);
} }
} }
LOG("Leaving TestSuite::ThreadProc"); LOG("Leaving TestSuite::ThreadProc");