diff options
Diffstat (limited to 'Tools/WebKitTestRunner/efl/main.cpp')
-rw-r--r-- | Tools/WebKitTestRunner/efl/main.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Tools/WebKitTestRunner/efl/main.cpp b/Tools/WebKitTestRunner/efl/main.cpp index c864ac13d..98bcde2a7 100644 --- a/Tools/WebKitTestRunner/efl/main.cpp +++ b/Tools/WebKitTestRunner/efl/main.cpp @@ -21,6 +21,8 @@ #include "EWebKit2.h" #include "TestController.h" +#include <wtf/Assertions.h> +#include <stdlib.h> #ifdef HAVE_ECORE_X #include <Ecore_X.h> @@ -28,13 +30,20 @@ int main(int argc, char** argv) { + WTFInstallReportBacktraceOnCrashHook(); + if (!ewk_init()) return 1; #ifdef HAVE_ECORE_X - if (!ecore_x_init(0)) { - ewk_shutdown(); - return 1; + const char* display = getenv("DISPLAY"); + int intialized = 0; + if (display) { + intialized = ecore_x_init(0); + if (!intialized) { + ewk_shutdown(); + return 1; + } } #endif @@ -42,7 +51,8 @@ int main(int argc, char** argv) WTR::TestController controller(argc, const_cast<const char**>(argv)); #ifdef HAVE_ECORE_X - ecore_x_shutdown(); + if (intialized) + ecore_x_shutdown(); #endif ewk_shutdown(); |