sync code with last improvements from OpenBSD

This commit is contained in:
purplerain 2023-08-28 05:57:34 +00:00
commit 88965415ff
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
26235 changed files with 29195616 additions and 0 deletions

104
dist/libxcb/tests/CheckLog.xsl vendored Normal file
View file

@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet
version="1.0"
xmlns:check="http://check.sourceforge.net/ns"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns="http://www.w3.org/TR/REC-html40">
<xsl:output method="html"/>
<xsl:template match="/">
<html>
<head>
<title>Test Suite Results</title>
</head>
<body>
<xsl:apply-templates/>
</body>
</html>
</xsl:template>
<xsl:template match="datetime">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="duration">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="check:suite">
<xsl:apply-templates select="check:title"/>
<center>
<table width="80%" border="1">
<thead>
<tr>
<td>Test Path</td>
<td>Test Function Location</td>
<td>C Identifier</td>
<td>Test Case</td>
<td>Result</td>
</tr>
</thead>
<tbody>
<xsl:apply-templates select="check:test"/>
</tbody>
</table>
</center>
</xsl:template>
<xsl:template match="check:testsuites">
<xsl:apply-templates select="check:suite"/>
<h3>Unit Test Statistics</h3>
<ul>
<li>date/time: <xsl:apply-templates select="check:datetime"/></li>
<li>duration: <xsl:apply-templates select="check:duration"/></li>
</ul>
<hr></hr>
</xsl:template>
<xsl:template match="check:title">
<h2>Test Suite: <xsl:apply-templates/></h2>
</xsl:template>
<xsl:template match="check:test[@result='success']">
<tr bgcolor="lime">
<xsl:apply-templates/>
</tr>
</xsl:template>
<xsl:template match="check:test[@result='failure']">
<tr bgcolor="red">
<xsl:apply-templates/>
</tr>
</xsl:template>
<xsl:template match="check:test[@result='error']">
<tr bgcolor="yellow">
<xsl:apply-templates/>
</tr>
</xsl:template>
<xsl:template match="check:path">
<td><xsl:apply-templates/></td>
</xsl:template>
<xsl:template match="check:fn">
<td><xsl:apply-templates/></td>
</xsl:template>
<xsl:template match="check:id">
<td><xsl:apply-templates/></td>
</xsl:template>
<xsl:template match="check:description">
<td><xsl:apply-templates/></td>
</xsl:template>
<xsl:template match="check:message">
<td><xsl:apply-templates/></td>
</xsl:template>
</xsl:stylesheet>

29
dist/libxcb/tests/Makefile.am vendored Normal file
View file

@ -0,0 +1,29 @@
########################
## tests/Makefile.am
########################
SUBDIRS =
EXTRA_DIST = CheckLog.xsl
AM_MAKEFLAGS = -k
AM_CFLAGS = -Wall -Werror @CHECK_CFLAGS@ -I$(top_srcdir)/src
LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxcb.la
if HAVE_CHECK
TESTS = check_all
check_PROGRAMS = check_all
check_all_SOURCES = check_all.c check_suites.h check_public.c
check-local: check-TESTS
$(RM) CheckLog.html
if test x$(HTML_CHECK_RESULT) = xyes; then \
$(XSLTPROC) $(srcdir)/CheckLog.xsl CheckLog*.xml > CheckLog.html; \
else \
touch CheckLog.html; \
fi
CheckLog.html: $(check_PROGRAMS)
$(MAKE) $(AM_MAKEFLAGS) check;
endif
clean-local::
$(RM) CheckLog.html CheckLog*.txt CheckLog*.xml

1149
dist/libxcb/tests/Makefile.in vendored Normal file

File diff suppressed because it is too large Load diff

29
dist/libxcb/tests/check_all.c vendored Normal file
View file

@ -0,0 +1,29 @@
#include <stdlib.h>
#include "check_suites.h"
#if CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION < 13
void suite_add_test(Suite *s, TFun tf, const char *name)
#else
void suite_add_test(Suite *s, const TTest *tt, const char *name)
#endif
{
TCase *tc = tcase_create(name);
#if CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION < 13
tcase_add_test(tc, tf);
#else
tcase_add_test(tc, tt);
#endif
suite_add_tcase(s, tc);
}
int main(void)
{
int nf;
SRunner *sr = srunner_create(public_suite());
srunner_set_xml(sr, "CheckLog_xcb.xml");
srunner_run_all(sr, CK_NORMAL);
nf = srunner_ntests_failed(sr);
srunner_free(sr);
return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}

218
dist/libxcb/tests/check_public.c vendored Normal file
View file

@ -0,0 +1,218 @@
#include <check.h>
#include <string.h>
#include <stdlib.h>
#include "check_suites.h"
#include "xcb.h"
#include "xcbext.h"
/* xcb_parse_display tests {{{ */
typedef enum test_type_t {
TEST_ARGUMENT, TEST_ENVIRONMENT, TEST_END
} test_type_t;
static const char *const test_string[] = { "", "via $DISPLAY " };
static void parse_display_pass(const char *name, const char *host, const int display, const int screen)
{
int success;
char *got_host;
int got_display, got_screen;
const char *argument = 0;
test_type_t test_type;
for(test_type = TEST_ARGUMENT; test_type != TEST_END; test_type++)
{
if(test_type == TEST_ARGUMENT)
{
argument = name;
putenv("DISPLAY=");
}
else if(test_type == TEST_ENVIRONMENT)
{
argument = 0;
setenv("DISPLAY", name, 1);
}
got_host = (char *) -1;
got_display = got_screen = -42;
mark_point();
success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
ck_assert_msg(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name);
ck_assert_msg(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
ck_assert_msg(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
ck_assert_msg(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen);
got_host = (char *) -1;
got_display = got_screen = -42;
mark_point();
success = xcb_parse_display(argument, &got_host, &got_display, 0);
ck_assert_msg(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name);
ck_assert_msg(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
ck_assert_msg(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
}
putenv("DISPLAY=");
}
static void parse_display_fail(const char *name)
{
int success;
char *got_host;
int got_display, got_screen;
const char *argument = 0;
test_type_t test_type;
for(test_type = TEST_ARGUMENT; test_type != TEST_END; test_type++)
{
if(test_type == TEST_ARGUMENT)
{
argument = name;
putenv("DISPLAY=");
}
else if(test_type == TEST_ENVIRONMENT)
{
if (!name) break;
argument = 0;
setenv("DISPLAY", name, 1);
}
got_host = (char *) -1;
got_display = got_screen = -42;
mark_point();
success = xcb_parse_display(argument, &got_host, &got_display, &got_screen);
ck_assert_msg(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name);
ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
ck_assert_msg(got_screen == -42, "screen changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_screen);
got_host = (char *) -1;
got_display = got_screen = -42;
mark_point();
success = xcb_parse_display(argument, &got_host, &got_display, 0);
ck_assert_msg(!success, "unexpected screenless parse success %sfor '%s'", test_string[test_type], name);
ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
}
putenv("DISPLAY=");
}
START_TEST(parse_display_unix)
{
parse_display_pass(":0", "", 0, 0);
parse_display_pass(":1", "", 1, 0);
parse_display_pass(":0.1", "", 0, 1);
}
END_TEST
START_TEST(parse_display_ip)
{
parse_display_pass("x.org:0", "x.org", 0, 0);
parse_display_pass("expo:0", "expo", 0, 0);
parse_display_pass("bigmachine:1", "bigmachine", 1, 0);
parse_display_pass("hydra:0.1", "hydra", 0, 1);
}
END_TEST
START_TEST(parse_display_ipv4)
{
parse_display_pass("198.112.45.11:0", "198.112.45.11", 0, 0);
parse_display_pass("198.112.45.11:0.1", "198.112.45.11", 0, 1);
}
END_TEST
START_TEST(parse_display_ipv6)
{
parse_display_pass(":::0", "::", 0, 0);
parse_display_pass("1:::0", "1::", 0, 0);
parse_display_pass("::1:0", "::1", 0, 0);
parse_display_pass("::1:0.1", "::1", 0, 1);
parse_display_pass("::127.0.0.1:0", "::127.0.0.1", 0, 0);
parse_display_pass("::ffff:127.0.0.1:0", "::ffff:127.0.0.1", 0, 0);
parse_display_pass("2002:83fc:d052::1:0", "2002:83fc:d052::1", 0, 0);
parse_display_pass("2002:83fc:d052::1:0.1", "2002:83fc:d052::1", 0, 1);
parse_display_pass("[::]:0", "[::]", 0, 0);
parse_display_pass("[1::]:0", "[1::]", 0, 0);
parse_display_pass("[::1]:0", "[::1]", 0, 0);
parse_display_pass("[::1]:0.1", "[::1]", 0, 1);
parse_display_pass("[::127.0.0.1]:0", "[::127.0.0.1]", 0, 0);
parse_display_pass("[::ffff:127.0.0.1]:0", "[::ffff:127.0.0.1]", 0, 0);
parse_display_pass("[2002:83fc:d052::1]:0", "[2002:83fc:d052::1]", 0, 0);
parse_display_pass("[2002:83fc:d052::1]:0.1", "[2002:83fc:d052::1]", 0, 1);
}
END_TEST
START_TEST(parse_display_decnet)
{
parse_display_pass("myws::0", "myws:", 0, 0);
parse_display_pass("big::1", "big:", 1, 0);
parse_display_pass("hydra::0.1", "hydra:", 0, 1);
}
END_TEST
START_TEST(parse_display_negative)
{
parse_display_fail(0);
parse_display_fail("");
parse_display_fail(":");
parse_display_fail("::");
parse_display_fail(":::");
parse_display_fail(":.");
parse_display_fail(":a");
parse_display_fail(":a.");
parse_display_fail(":0.");
parse_display_fail(":.a");
parse_display_fail(":.0");
parse_display_fail(":0.a");
parse_display_fail(":0.0.");
parse_display_fail("127.0.0.1");
parse_display_fail("127.0.0.1:");
parse_display_fail("127.0.0.1::");
parse_display_fail("::127.0.0.1");
parse_display_fail("::127.0.0.1:");
parse_display_fail("::127.0.0.1::");
parse_display_fail("::ffff:127.0.0.1");
parse_display_fail("::ffff:127.0.0.1:");
parse_display_fail("::ffff:127.0.0.1::");
parse_display_fail("localhost");
parse_display_fail("localhost:");
parse_display_fail("localhost::");
}
END_TEST
/* }}} */
static void popcount_eq(uint32_t bits, int count)
{
ck_assert_msg(xcb_popcount(bits) == count, "unexpected popcount(%08x) != %d", bits, count);
}
START_TEST(popcount)
{
uint32_t mask;
int count;
for (mask = 0xffffffff, count = 32; count >= 0; mask >>= 1, --count) {
popcount_eq(mask, count);
}
for (mask = 0x80000000; mask; mask >>= 1) {
popcount_eq(mask, 1);
}
for (mask = 0x80000000; mask > 1; mask >>= 1) {
popcount_eq(mask | 1, 2);
}
}
END_TEST
Suite *public_suite(void)
{
Suite *s = suite_create("Public API");
putenv("DISPLAY=");
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_ipv4, "xcb_parse_display ipv4");
suite_add_test(s, parse_display_ipv6, "xcb_parse_display ipv6");
suite_add_test(s, parse_display_decnet, "xcb_parse_display decnet");
suite_add_test(s, parse_display_negative, "xcb_parse_display negative");
suite_add_test(s, popcount, "xcb_popcount");
return s;
}

8
dist/libxcb/tests/check_suites.h vendored Normal file
View file

@ -0,0 +1,8 @@
#include <check.h>
#if CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION < 13
void suite_add_test(Suite *s, TFun tf, const char *name);
#else
void suite_add_test(Suite *s, const TTest *tt, const char *name);
#endif
Suite *public_suite(void);