aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/test
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-08-31 15:18:29 +0200
committermarha <marha@users.sourceforge.net>2012-09-04 14:23:28 +0200
commitd7fc06ac528d54e0e1416cb8aa89b6fd072400a5 (patch)
tree74cccede044412bba5723a132f1385aa9259f04b /xorg-server/test
parent9dec848b23cf905ded387820f2893425cc00d545 (diff)
downloadvcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.tar.gz
vcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.tar.bz2
vcxsrv-d7fc06ac528d54e0e1416cb8aa89b6fd072400a5.zip
randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver
git update 31 Aug 2012
Diffstat (limited to 'xorg-server/test')
-rw-r--r--xorg-server/test/os.c2
-rw-r--r--xorg-server/test/signal-logging.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/test/os.c b/xorg-server/test/os.c
index 8f1107ded..2d005a0d4 100644
--- a/xorg-server/test/os.c
+++ b/xorg-server/test/os.c
@@ -149,7 +149,7 @@ static void block_sigio_test_nested(void)
tail guard
tail guard must be hit.
*/
- sighandler_t old_handler;
+ void (*old_handler)(int);
old_handler = signal(SIGIO, sighandler);
expect_signal = 1;
assert(raise(SIGIO) == 0);
diff --git a/xorg-server/test/signal-logging.c b/xorg-server/test/signal-logging.c
index 3206ddefa..810bd20ed 100644
--- a/xorg-server/test/signal-logging.c
+++ b/xorg-server/test/signal-logging.c
@@ -178,6 +178,7 @@ number_formatting(void)
assert(check_signed_number_format_test(signed_tests + i));
}
+#pragma GCC diagnostic ignored "-Wformat-security"
static void logging_format(void)
{
const char *log_file_path = "/tmp/Xorg-logging-test.log";
@@ -207,9 +208,7 @@ static void logging_format(void)
assert(strcmp(logmsg, "(EE) test message\n") == 0);
/* long buf is truncated to "....en\n" */
-#pragma GCC diagnostic ignored "-Wformat-security"
LogMessageVerbSigSafe(X_ERROR, -1, buf);
-#pragma GCC diagnostic pop "-Wformat-security"
read_log_msg(logmsg);
assert(strcmp(&logmsg[strlen(logmsg) - 3], "en\n") == 0);
@@ -298,6 +297,7 @@ static void logging_format(void)
#undef read_log_msg
}
+#pragma GCC diagnostic pop "-Wformat-security"
int
main(int argc, char **argv)