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

Fix unit tests for FreeBSD 

putenv() string must contain '='
environment failure test is invalid if argument is NULL
This commit is contained in:
Ian Osgood 2006-11-26 09:26:32 -08:00 committed by Josh Triplett
parent 7ed407417c
commit e097542517
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ libxcb (1.0-2) unstable; urgency=low
* Incorporate NMU by Julien Cristau; thanks, Julien! * Incorporate NMU by Julien Cristau; thanks, Julien!
* Add XS-Vcs-Browser field to debian/control. * Add XS-Vcs-Browser field to debian/control.
* Cherry-pick post-1.0 changes from master:
* " Fix unit tests for FreeBSD"
* Upload to unstable. * Upload to unstable.
-- Josh Triplett <josh@freedesktop.org> Mon, 21 May 2007 12:48:40 -0700 -- Josh Triplett <josh@freedesktop.org> Mon, 21 May 2007 12:48:40 -0700

11
tests/check_public.c
View File

@ -24,7 +24,7 @@ static void parse_display_pass(const char *name, const char *host, const int dis
if(test_type == TEST_ARGUMENT) if(test_type == TEST_ARGUMENT)
{ {
argument = name; argument = name;
putenv("DISPLAY"); putenv("DISPLAY=");
} }
else if(test_type == TEST_ENVIRONMENT) else if(test_type == TEST_ENVIRONMENT)
{ {
@ -49,7 +49,7 @@ static void parse_display_pass(const char *name, const char *host, const int dis
fail_unless(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host); fail_unless(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
fail_unless(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display); fail_unless(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
} }
putenv("DISPLAY"); putenv("DISPLAY=");
} }
static void parse_display_fail(const char *name) static void parse_display_fail(const char *name)
@ -65,10 +65,11 @@ static void parse_display_fail(const char *name)
if(test_type == TEST_ARGUMENT) if(test_type == TEST_ARGUMENT)
{ {
argument = name; argument = name;
putenv("DISPLAY"); putenv("DISPLAY=");
} }
else if(test_type == TEST_ENVIRONMENT) else if(test_type == TEST_ENVIRONMENT)
{ {
if (!name) break;
argument = 0; argument = 0;
setenv("DISPLAY", name, 1); setenv("DISPLAY", name, 1);
} }
@ -90,7 +91,7 @@ static void parse_display_fail(const char *name)
fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host); fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display); fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
} }
putenv("DISPLAY"); putenv("DISPLAY=");
} }
START_TEST(parse_display_unix) START_TEST(parse_display_unix)
@ -182,7 +183,7 @@ END_TEST
Suite *public_suite(void) Suite *public_suite(void)
{ {
Suite *s = suite_create("Public API"); Suite *s = suite_create("Public API");
putenv("DISPLAY"); putenv("DISPLAY=");
suite_add_test(s, parse_display_unix, "xcb_parse_display unix"); suite_add_test(s, parse_display_unix, "xcb_parse_display unix");
suite_add_test(s, parse_display_ip, "xcb_parse_display ip"); suite_add_test(s, parse_display_ip, "xcb_parse_display ip");
suite_add_test(s, parse_display_ipv4, "xcb_parse_display ipv4"); suite_add_test(s, parse_display_ipv4, "xcb_parse_display ipv4");