From 581972c905cb3dd9fe2c844004d13ae0c2c8e7b5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 3 Dec 2011 21:13:01 +0900
Subject: [PATCH] More file splitting for code reuse.

---
 libs/models/test/Makefile.am |  2 +-
 libs/models/test/main.c      | 55 ++++++++++++++++++++++++++++++++++++
 libs/models/test/testclip.c  | 54 +----------------------------------
 3 files changed, 57 insertions(+), 54 deletions(-)
 create mode 100644 libs/models/test/main.c

diff --git a/libs/models/test/Makefile.am b/libs/models/test/Makefile.am
index 792e7ed30..3576c79bc 100644
--- a/libs/models/test/Makefile.am
+++ b/libs/models/test/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS= foreign
 INCLUDES= -I$(srcdir) -I$(top_srcdir)/include
 
 check_PROGRAMS=testclip
-EXTRA_DIST=	trace-id.c trace-qf-bad.c hulls.h
+EXTRA_DIST=	trace-id.c trace-qf-bad.c hulls.h main.c
 
 testclip_SOURCES=testclip.c hulls.c
 testclip_LDADD= $(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
diff --git a/libs/models/test/main.c b/libs/models/test/main.c
new file mode 100644
index 000000000..a3d0a3914
--- /dev/null
+++ b/libs/models/test/main.c
@@ -0,0 +1,55 @@
+#define num_tests (sizeof (tests) / sizeof (tests[0]))
+
+static int test_enabled[num_tests] = { 0 };
+
+int
+main (int argc, char **argv)
+{
+//	vec3_t      start, end;
+	int         c;
+	size_t      i, test;
+	int         pass = 1;
+
+	while ((c = getopt (argc, argv, "qvt:")) != EOF) {
+		switch (c) {
+			case 'q':
+				verbose--;
+				break;
+			case 'v':
+				verbose++;
+				break;
+			case 't':
+				test = atoi (optarg);
+				if (test < num_tests) {
+					test_enabled[test] = 1;
+				} else {
+					fprintf (stderr, "Bad test number (0 - %zd)\n", num_tests);
+					return 1;
+				}
+				break;
+			default:
+				fprintf (stderr, "-q (quiet) -v (verbose) and/or -t TEST "
+								 "(test number)\n");
+				return 1;
+		}
+	}
+
+	for (i = 0; i < num_tests; i++)
+		if (test_enabled[i])
+			break;
+	if (i == num_tests) {
+		for (i = 0; i < num_tests; i++)
+			test_enabled[i] = 1;
+	}
+
+	if (verbose > 0)
+		printf ("start -> end => stop frac allsolid startsolid inopen "
+				"inwater\n");
+	for (i = 0; i < num_tests; i++) {
+		if (!test_enabled[i])
+			continue;
+		pass &= run_test (&tests[i]);
+	}
+
+	return !pass;
+}
diff --git a/libs/models/test/testclip.c b/libs/models/test/testclip.c
index 165121918..94f52f675 100644
--- a/libs/models/test/testclip.c
+++ b/libs/models/test/testclip.c
@@ -174,8 +174,6 @@ test_t tests[] = {
 };
 #define num_tests (sizeof (tests) / sizeof (tests[0]))
 
-static int test_enabled[num_tests] = { 0 };
-
 int verbose = 0;
 
 static trace_t
@@ -363,54 +361,4 @@ nodeleaf_bail:
 	return res;
 }
 
-int
-main (int argc, char **argv)
-{
-//	vec3_t      start, end;
-	int         c;
-	size_t      i, test;
-	int         pass = 1;
-
-	while ((c = getopt (argc, argv, "qvt:")) != EOF) {
-		switch (c) {
-			case 'q':
-				verbose--;
-				break;
-			case 'v':
-				verbose++;
-				break;
-			case 't':
-				test = atoi (optarg);
-				if (test < num_tests) {
-					test_enabled[test] = 1;
-				} else {
-					fprintf (stderr, "Bad test number (0 - %zd)\n", num_tests);
-					return 1;
-				}
-				break;
-			default:
-				fprintf (stderr, "-q (quiet) -v (verbose) and/or -t TEST "
-								 "(test number)\n");
-				return 1;
-		}
-	}
-
-	for (i = 0; i < num_tests; i++)
-		if (test_enabled[i])
-			break;
-	if (i == num_tests) {
-		for (i = 0; i < num_tests; i++)
-			test_enabled[i] = 1;
-	}
-
-	if (verbose > 0)
-		printf ("start -> end => stop frac allsolid startsolid inopen "
-				"inwater\n");
-	for (i = 0; i < num_tests; i++) {
-		if (!test_enabled[i])
-			continue;
-		pass &= run_test (&tests[i]);
-	}
-
-	return !pass;
-}
+#include "main.c"