Merge remote-tracking branch 'origin/master'

[movit] / gtest_sdl_main.cpp

diff --git a/gtest_sdl_main.cpp b/gtest_sdl_main.cpp
index 47d7c679107c093cdda8530ef4d9ce42cee6a71a..fa3a835cda7f167e00b199535a68d28ae23ec0f2 100644 (file)
--- a/gtest_sdl_main.cpp
+++ b/gtest_sdl_main.cpp
@@ -1,9 +1,14 @@
+#define GTEST_HAS_EXCEPTIONS 0
+
 #include <SDL/SDL.h>
 #include "gtest/gtest.h"
 
 int main(int argc, char **argv) {
        // Set up an OpenGL context using SDL.
-       SDL_Init(SDL_INIT_VIDEO);
+       if (SDL_Init(SDL_INIT_VIDEO) == -1) {
+               fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
+               exit(1);
+       }
        SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
        SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
        SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
@@ -11,5 +16,7 @@ int main(int argc, char **argv) {
        SDL_WM_SetCaption("OpenGL window for unit test", NULL);
 
        testing::InitGoogleTest(&argc, argv);
-       return RUN_ALL_TESTS();
+       int err = RUN_ALL_TESTS();
+       SDL_Quit();
+       exit(err);
 }