diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-14 10:04:50 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-14 10:07:50 +1000 |
commit | b8be34ba0e218725a0b4641e918c954a0f817cb7 (patch) | |
tree | 96240c97c3fceb459cc2fc233b13ccc46e81ae92 | |
parent | e3623da72cb87b0f3c11284af7a42d561a9014e3 (diff) |
test: restore error handler after test
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | test/xserver-test.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/xserver-test.cpp b/test/xserver-test.cpp index 822bb23..5e24ae7 100644 --- a/test/xserver-test.cpp +++ b/test/xserver-test.cpp @@ -263,7 +263,8 @@ TEST(XServer, NondefaultErrorHandler) pid_t pid = fork(); if (pid == 0) { - XSetErrorHandler(_test_error_handler); + XErrorHandler old_handler; + old_handler = XSetErrorHandler(_test_error_handler); XServer server; server.SetOption("-logfile", LOGFILE_DIR "/xorg-error-handler-test.log"); @@ -276,6 +277,7 @@ TEST(XServer, NondefaultErrorHandler) XColor color; XQueryColor(dpy, 0, &color); XSync(dpy, False); + XSetErrorHandler(old_handler); exit(error_handler_triggered ? 0 : 1); } |