Merging r6426 through r6466 from trunk to ogl-es branch
Note: Updated IShaderConstantSetCallBack not yet supported by ogl-es drivers git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6467 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
@@ -49,7 +49,7 @@ int main(int argumentCount, char * arguments[])
|
||||
#if 0
|
||||
// To interactively debug a test, move it (temporarily) in here and enable the define to only run this test
|
||||
// Otherwise debugging is slightly tricky as each test runs in it's own process.
|
||||
TEST(ioScene);
|
||||
TEST(matrixOps);
|
||||
#else
|
||||
|
||||
TEST(disambiguateTextures); // Normally you should run this first, since it validates the working directory.
|
||||
@@ -246,7 +246,10 @@ int main(int argumentCount, char * arguments[])
|
||||
#ifdef _IRR_WINDOWS_
|
||||
(void)system("tests.log");
|
||||
#else
|
||||
(void)system("$PAGER tests.log");
|
||||
if ( getenv("PAGER") )
|
||||
(void)system("$PAGER tests.log");
|
||||
else
|
||||
printf("See tests.log for results. Or set $PAGER environment variable to show it directly.\n");
|
||||
#endif
|
||||
return fails;
|
||||
}
|
||||
|
Reference in New Issue
Block a user