frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: move GCC diagnostics pragma outside of function 

This is a  a gcc 4.6+ feature.

signal-logging.c:210: error: #pragma GCC diagnostic not allowed inside
functions

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Hutterer 2012-08-29 09:11:35 +10:00 committed by Keith Packard
parent 486038fe16
commit 148583d62b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/signal-logging.c
View File

@ -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)