diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/testlauncher.cpp | 7 | ||||
-rw-r--r-- | src/test/testlauncher.h | 6 | ||||
-rw-r--r-- | src/test/testmain.cpp | 2 | ||||
-rw-r--r-- | src/test/testmain.h | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index ba9cfc267..7c01402a8 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -54,7 +54,7 @@ #ifdef WIN32 #include <windows.h> #define sleep(seconds) Sleep((seconds) * 1000) -#endif +#endif // WIN32 #include <sys/time.h> @@ -501,7 +501,8 @@ int TestLauncher::testDyeSpeed() ((static_cast<long int>(time1.tv_sec) * 1000000000L + static_cast<long int>(time1.tv_nsec)) / 1); printf("time: %ld\n", diff); -#endif +#endif // defined __linux__ || defined __linux + return 0; } @@ -689,4 +690,4 @@ int TestLauncher::calcFps(const timeval &start, return CAST_S32(static_cast<long>(calls) * 10000 / mtime); } -#endif +#endif // USE_OPENGL diff --git a/src/test/testlauncher.h b/src/test/testlauncher.h index 109b661da..4bfba9abd 100644 --- a/src/test/testlauncher.h +++ b/src/test/testlauncher.h @@ -27,11 +27,11 @@ #ifdef WIN32 #include <sys/time.h> -#endif +#endif // WIN32 #ifdef __native_client__ #include <sys/time.h> -#endif +#endif // __native_client__ #include "localconsts.h" @@ -84,5 +84,5 @@ class TestLauncher final std::ofstream file; }; -#endif +#endif // USE_OPENGL #endif // TEST_TESTLAUNCHER_H diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp index a242b89bd..e5270d020 100644 --- a/src/test/testmain.cpp +++ b/src/test/testmain.cpp @@ -426,4 +426,4 @@ int TestMain::invokeSafeOpenGLRenderTest(const std::string &test) log->log("%s: %d", test.c_str(), ret); return ret; } -#endif +#endif // USE_OPENGL diff --git a/src/test/testmain.h b/src/test/testmain.h index 9cc81702d..f54f60829 100644 --- a/src/test/testmain.h +++ b/src/test/testmain.h @@ -89,5 +89,5 @@ class TestMain final Configuration mConfig; }; -#endif +#endif // USE_OPENGL #endif // TEST_TESTMAIN_H |