diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-20 23:05:30 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-20 23:05:30 +0300 |
| commit | ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 (patch) | |
| tree | f47956f1fb84a1a6f6ec73d347be186f2cc3e8c3 /src/test | |
| parent | 54b1228263aeb48c766806c0391fbfdffe0bc1a5 (diff) | |
| download | manaverse-ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6.tar.gz manaverse-ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6.tar.bz2 manaverse-ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6.tar.xz manaverse-ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6.zip | |
Fix code style.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/testlauncher.cpp | 2 | ||||
| -rw-r--r-- | src/test/testmain.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 6f2f7a612..2f6860d43 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -117,7 +117,7 @@ int TestLauncher::testFps() timeval end; Wallpaper::loadWallpapers(); - const std::string wallpaperName = Wallpaper::getWallpaper(800, 600); + Wallpaper::getWallpaper(800, 600); Image *img[4]; img[0] = Theme::getImageFromTheme("graphics/sprites/arrow_up.gif"); diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index 287eeb706..70fcfc346 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -264,24 +264,24 @@ int TestMain::invokeFastOpenGLRenderTest(std::string test) { #if defined USE_OPENGL config.setValue("opengl", 1); -#else - return -1; -#endif config.write(); int ret = execFile(fileName, fileName, "-t", test, 30); log->log("%s: %d", test.c_str(), ret); return ret; +#else + return -1; +#endif } int TestMain::invokeSafeOpenGLRenderTest(std::string test) { #if defined USE_OPENGL config.setValue("opengl", 2); -#else - return -1; -#endif config.write(); int ret = execFile(fileName, fileName, "-t", test, 30); log->log("%s: %d", test.c_str(), ret); return ret; +#else + return -1; +#endif } |