From: Jacob Champion <jchampion@apache.org>
Date: Thu, 25 May 2017 21:18:33 +0000 (+0000)
Subject: httpdunit_gen_cases: separate declarations from calls
X-Git-Tag: 2.5.0-alpha~367^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4308d4c64e365feacb95951aff300ad1db1af10;p=apache

httpdunit_gen_cases: separate declarations from calls

This gets around strict compiler warnings.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796203 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.in b/Makefile.in
index f6fac28132..9bba3ac080 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -456,8 +456,11 @@ $(testcase_STUBS): %.tests: %.c
 
 test/httpdunit.cases: $(testcase_SOURCES) | unittest-objdir
 	for t in $^; do \
-	    $(top_srcdir)/build/httpdunit_gen_cases.pl < "$$t"; \
+	    $(top_srcdir)/build/httpdunit_gen_cases.pl --declaration < "$$t"; \
 	done > $@
+	for t in $^; do \
+	    $(top_srcdir)/build/httpdunit_gen_cases.pl < "$$t"; \
+	done >> $@
 
 test/httpdunit.lo: test/httpdunit.c test/httpdunit.cases | unittest-objdir
 
diff --git a/build/httpdunit_gen_cases.pl b/build/httpdunit_gen_cases.pl
index a40d12c773..8e492a664d 100755
--- a/build/httpdunit_gen_cases.pl
+++ b/build/httpdunit_gen_cases.pl
@@ -14,10 +14,21 @@
 use strict;
 use warnings;
 
+use Getopt::Long;
+
+my $print_declaration = 0;
+
+GetOptions("declaration" => \$print_declaration)
+    or die("unknown option");
+
 while (my $line = <>) {
     if ($line =~ /^HTTPD_BEGIN_TEST_CASE(?:\w+)?\((\w+)/) {
         my $name = "$1_test_case";
-        print "TCase *$name(void); ";
-        print "suite_add_tcase(suite, $name());\n";
+
+        if ($print_declaration) {
+            print "TCase *$name(void);\n";
+        } else {
+            print "suite_add_tcase(suite, $name());\n";
+        }
     }
 }