Commit 47148c64 authored by hybrid's avatar hybrid

Looks like another merge problem fixed...

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2027 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 136f9981
...@@ -54,6 +54,8 @@ int main(int argumentCount, char * arguments[]) ...@@ -54,6 +54,8 @@ int main(int argumentCount, char * arguments[])
extern bool b3dAnimation(void); extern bool b3dAnimation(void);
extern bool guiDisabledMenu(void); extern bool guiDisabledMenu(void);
extern bool textureRenderStates(void); extern bool textureRenderStates(void);
extern bool burningsVideo(void);
extern bool makeColorKeyTexture(void);
typedef struct _STest typedef struct _STest
{ {
...@@ -77,11 +79,11 @@ int main(int argumentCount, char * arguments[]) ...@@ -77,11 +79,11 @@ int main(int argumentCount, char * arguments[])
TEST(guiDisabledMenu), TEST(guiDisabledMenu),
TEST(softwareDevice), TEST(softwareDevice),
TEST(b3dAnimation), TEST(b3dAnimation),
TEST(textureRenderStates) TEST(textureRenderStates),
TEST(burningsVideo),
TEST(makeColorKeyTexture)
}; };
static const unsigned int numberOfTests = sizeof tests / sizeof tests[0]; static const unsigned int numberOfTests = sizeof tests / sizeof tests[0];
TEST(burningsVideo);
TEST(makeColorKeyTexture);
unsigned int testToRun = 0; unsigned int testToRun = 0;
unsigned int fails = 0; unsigned int fails = 0;
......
...@@ -51,7 +51,7 @@ static bool doTestWith(E_DRIVER_TYPE driverType, ...@@ -51,7 +51,7 @@ static bool doTestWith(E_DRIVER_TYPE driverType,
driver->endScene(); driver->endScene();
char screenshotName[256]; char screenshotName[256];
(void)sprintf(screenshotName, "-makeColorKeyTexture-%s.png", (void)snprintf(screenshotName, 256, "-makeColorKeyTexture-%s.png",
zeroTexels? "old" : "new"); zeroTexels? "old" : "new");
bool result = takeScreenshotAndCompareAgainstReference(driver, screenshotName); bool result = takeScreenshotAndCompareAgainstReference(driver, screenshotName);
......
Test suite pass at GMT Mon Dec 29 19:37:38 2008 Test suite pass at GMT Sat Jan 03 23:29:59 2009
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment