fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-07 16:48:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh+git://git.cairographics.org/git/cairo

Browse source
This commit is contained in:
Michael Emmel 2006-07-14 09:37:22 -07:00
commit 5d64efdbb8
3 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.am
View file

@ -4,11 +4,11 @@ SUBDIRS = pixman src doc
.PHONY: doc test .PHONY: doc test
doc: doc:
-$(MAKE) -C doc doc -$(MAKE) -C doc doc
test: test: all
-$(MAKE) -C test test -$(MAKE) -C test test
retest: retest: all
-$(MAKE) -C test retest -$(MAKE) -C test retest
recheck: recheck: all
-$(MAKE) -C test recheck -$(MAKE) -C test recheck
# libpng is required for our test programs # libpng is required for our test programs

26
test/cairo-test.c
View file

@ -1637,7 +1637,7 @@ cairo_test_expecting (cairo_test_t *test,
/* we use volatile here to make sure values are not clobbered /* we use volatile here to make sure values are not clobbered
* by longjmp */ * by longjmp */
volatile int i, j, num_targets; volatile int i, j, num_targets;
volatile cairo_bool_t limited_targets = 0, no_fail_on_stdout = 0; volatile cairo_bool_t limited_targets = FALSE, print_fail_on_stdout = TRUE;
const char *tname; const char *tname;
void (*old_segfault_handler)(int); void (*old_segfault_handler)(int);
volatile cairo_test_status_t status, ret; volatile cairo_test_status_t status, ret;
@ -1777,7 +1777,7 @@ cairo_test_expecting (cairo_test_t *test,
fail_face = "\033[41m\033[37m\033[1m"; fail_face = "\033[41m\033[37m\033[1m";
normal_face = "\033[m"; normal_face = "\033[m";
if (isatty (1)) if (isatty (1))
no_fail_on_stdout = 1; print_fail_on_stdout = FALSE;
} }
#endif #endif
@ -1794,7 +1794,7 @@ cairo_test_expecting (cairo_test_t *test,
if ((tname = getenv ("CAIRO_TEST_TARGET")) != NULL && *tname) { if ((tname = getenv ("CAIRO_TEST_TARGET")) != NULL && *tname) {
limited_targets = 1; limited_targets = TRUE;
num_targets = 0; num_targets = 0;
targets_to_test = NULL; targets_to_test = NULL;
@ -1881,10 +1881,14 @@ cairo_test_expecting (cairo_test_t *test,
cairo_test_log ("UNTESTED\n"); cairo_test_log ("UNTESTED\n");
break; break;
case CAIRO_TEST_CRASHED: case CAIRO_TEST_CRASHED:
if (!no_fail_on_stdout) if (print_fail_on_stdout) {
printf ("CRASHED\n"); printf ("!!!CRASHED!!!\n");
} else {
/* eat the test name */
printf ("\r");
}
cairo_test_log ("CRASHED\n"); cairo_test_log ("CRASHED\n");
fprintf (stderr, "%s-%s-%s [%d]:\t%s!!!TEST-CASE CRASH!!!%s\n", fprintf (stderr, "%s-%s-%s [%d]:\t%s!!!CRASHED!!!%s\n",
test->name, target->name, test->name, target->name,
_cairo_test_content_name (target->content), dev_offset, _cairo_test_content_name (target->content), dev_offset,
fail_face, normal_face); fail_face, normal_face);
@ -1896,13 +1900,17 @@ cairo_test_expecting (cairo_test_t *test,
printf ("XFAIL\n"); printf ("XFAIL\n");
cairo_test_log ("XFAIL\n"); cairo_test_log ("XFAIL\n");
} else { } else {
if (!no_fail_on_stdout) if (print_fail_on_stdout) {
printf ("FAIL\n"); printf ("FAIL\n");
cairo_test_log ("FAIL\n"); } else {
fprintf (stderr, "%s-%s-%s [%d]:\t%sUNEXPECTED FAILURE%s\n", /* eat the test name */
printf ("\r");
}
fprintf (stderr, "%s-%s-%s [%d]:\t%sFAIL%s\n",
test->name, target->name, test->name, target->name,
_cairo_test_content_name (target->content), dev_offset, _cairo_test_content_name (target->content), dev_offset,
fail_face, normal_face); fail_face, normal_face);
cairo_test_log ("FAIL\n");
} }
ret = status; ret = status;
break; break;

4
test/make-html.pl
View file

@ -45,7 +45,9 @@ my $tests = {};
my $teststats = {}; my $teststats = {};
foreach (<*.log>) { if ($#ARGV >= 0) { @files = @ARGV; } else { @files = <*.log>; }
foreach (<@files>) {
(open LOG, "$_") || next; (open LOG, "$_") || next;
while (<LOG>) { while (<LOG>) {
next unless /^TEST: (.*) TARGET: (.*) FORMAT: (.*) OFFSET: (.*) RESULT: (.*)$/; next unless /^TEST: (.*) TARGET: (.*) FORMAT: (.*) OFFSET: (.*) RESULT: (.*)$/;