[test] Make test constructors without perl.

Remove the dependency on perl when building the test suite
by replacing the script which makes cairo-test-constructors.c
with a C program.

test/.gitignore

@@ -36,3 +36,4 @@ valgrind-log
 *.o
 *~
 .*.sw?
+make-cairo-test-constructors

test/Makefile.am

@@ -67,8 +67,11 @@ test_sources += $(test)
 
 TESTS += cairo-test-suite$(EXEEXT)
 
-cairo-test-constructors.c: Makefile $(test_sources) make-cairo-test-constructors.pl
-	@(cd $(srcdir) && ./make-cairo-test-constructors.pl $(test_sources)) > $@
+make-cairo-test-constructors$(EXEEXT): make-cairo-test-constructors.c
+	$(CC) -o $@ make-cairo-test-constructors.c
+
+cairo-test-constructors.c: Makefile $(test_sources) make-cairo-test-constructors$(EXEEXT)
+	(cd $(srcdir) && ./make-cairo-test-constructors$(EXEEXT) $(test_sources)) > $@
 
 cairo_test_suite_SOURCES = 		\
 	$(cairo_test_suite_sources)	\
@@ -109,9 +112,9 @@ cairo_test_trace_DEPENDENCIES = \
 endif
 
 BUILT_SOURCES += cairo-test-constructors.c
-noinst_SCRIPTS = make-cairo-test-constructors.pl
 EXTRA_DIST += $(BUILT_SOURCES) $(noinst_SCRIPTS) COPYING
 CLEANFILES += $(BUILT_SOURCES)
+CLEANFILES += make-cairo-test-constructors
 
 # All tests which have a reference image go here.
 REFERENCE_IMAGES = \

test/Makefile.win32

@@ -14,8 +14,11 @@ TESTCORE_SOURCES = \
 
 all: cairo-test-suite.exe
 
-cairo-test-constructors.c: $(test_sources)
-	./make-cairo-test-constructors.pl $(test_sources) > $@
+make-cairo-test-constructors.exe: $(CFG)/make-cairo-test-constructors.obj
+	$(CC) $(OPT) $(MS_MDFLAGS) $(CFG)/make-cairo-test-constructors.obj -Fe"$@" -link $(LDFLAGS) user32.lib /NODEFAULTLIB:library
+
+cairo-test-constructors.c: $(test_sources) make-cairo-test-constructors.exe
+	./make-cairo-test-constructors.exe $(test_sources) > $@
 
 SOURCES = $(cairo_test_suite_sources) $(test_sources) cairo-test-constructors.c
 

test/make-cairo-test-constructors.c

@@ -0,0 +1,153 @@
+/*
+ * Copyright © 2009 Joonas Pihlaja
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+/* Usage:
+ *   ./make-cairo-test-constructors [tests.c...] >cairo-test-constructors.c
+ *
+ * Parses invocations of the CAIRO_TEST macro from the source files
+ * given on the command line, gathers names of tests, and outputs a C
+ * file with one function _cairo_test_runner_register_tests() which
+ * calls the functions _register_<testname>() in reverse order.
+ */
+/* Keep this file ANSI compliant without any special needs. */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+struct name {
+    struct name *next;
+    char        *name;
+};
+
+static struct name *head = NULL;
+
+static void *
+xmalloc (size_t n)
+{
+    void *bytes = malloc(n);
+    if (!bytes) {
+        fprintf (stderr, "Out of memory\n");
+        exit(2);
+    }
+    return bytes;
+}
+
+static void
+add_name (const char *name)
+{
+    struct name *node = xmalloc (sizeof (struct name));
+
+    node->name = xmalloc (strlen(name)+1);
+    strcpy (node->name, name);
+
+    node->next = head;
+    head = node;
+}
+
+static int
+scan_file (const char   *filename,
+           FILE         *fp)
+{
+    int line_num = 0;
+    char linebuf[1024];
+    int fail = 0;
+
+    while (fgets (linebuf, sizeof (linebuf)-1, fp)) {
+        char *macro;
+        char *name;
+        size_t length;
+
+        line_num++;
+        linebuf[sizeof (linebuf)-1] = 0;
+
+        macro = strstr (linebuf, "CAIRO_TEST");
+        if (!macro)
+            continue;
+        macro += strlen ("CAIRO_TEST");
+
+        length = strspn (macro, " (");
+        if (length == 0)
+            continue;
+        name = macro + length;
+
+        length = strspn (name,
+                         "_"
+                         "abcdefghijklmnopqrstuvwxyz"
+                         "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                         "0123456789");
+        name[length] = 0;
+
+        if (length == 0) {
+            fprintf (stderr, "%s:%d: CAIRO_TEST invocation "
+                     "can't be parsed by make-cairo-test-constructors.c\n",
+                     filename, line_num);
+            fail = 1;
+            continue;
+        }
+
+        add_name (name);
+    }
+
+    return fail;
+}
+
+int
+main (int argc, char **argv)
+{
+    int i;
+    int fail = 0;
+    struct name *node;
+
+    for (i=1; i<argc; i++) {
+        FILE *fp = fopen (argv[i], "r");
+        if (fp) {
+            fail |= scan_file (argv[i], fp);
+            fclose (fp);
+        }
+    }
+    if (fail)
+        exit(1);
+
+    puts ("/* WARNING: Autogenerated file - "
+          "see make-cairo-test-constructors.c! */");
+    puts ("");
+    puts ("#include \"cairo-test-private.h\"");
+    puts ("");
+
+    for (node = head; node; node = node->next) {
+        printf("extern void _register_%s (void);\n",
+               node->name);
+    }
+    puts("");
+
+    puts ("void _cairo_test_runner_register_tests (void);");
+    puts("");
+
+    puts ("void");
+    puts ("_cairo_test_runner_register_tests (void)");
+    puts ("{");
+    for (node = head; node; node = node->next) {
+        printf("    _register_%s ();\n", node->name);
+    }
+    puts ("}");
+
+    return 0;
+}

test/make-cairo-test-constructors.pl

@@ -1,18 +0,0 @@
-#!/usr/bin/perl -w
-
-while (<>) {
-    next unless /CAIRO_TEST \((.*),/; # XXX Parse multi-line macro
-    push @names, $1;
-}
-
-print <<EOD
-/* WARNING: Autogenerated file - see make-cairo-test-constructors.pl! */
-
-#include "cairo-test-private.h"
-
-EOD
-;
-print "extern void _register_$_ (void);\n" foreach (@names);
-print "\nvoid\n_cairo_test_runner_register_tests (void)\n{\n";
-print "    _register_$_ ();\n" foreach (reverse @names);
-print "}\n";