Restructure output from tests.

[gedcom-parse.git] / t / src / update.c

diff --git a/t/src/update.c b/t/src/update.c
index bc2e0f6f614c65cbe12b202a418a98fd54a02ded..d9f02a24651577a2145b3b543bf70dbd23ca88eb 100644 (file)
--- a/t/src/update.c
+++ b/t/src/update.c
@@ -22,26 +22,10 @@
 /* $Name$ */
 
 #include "gedcom.h"
+#include "output.h"
 #include <locale.h>
 #include <stdio.h>
 
-#define OUTFILE "testgedcom.out"
-FILE* outfile = NULL;
-int quiet = 0;
-
-void output(int to_stdout_too, char* format, ...)
-{
-  va_list ap;
-  va_start(ap, format);
-  if (outfile) {
-    vfprintf(outfile, format, ap);
-  }
-  if (to_stdout_too && !quiet) {
-    vprintf(format, ap);
-  }
-  va_end(ap);
-}
-
 void gedcom_message_handler(Gedcom_msg_type type, char *msg)
 {
   if (type == MESSAGE)
@@ -60,6 +44,7 @@ void show_help ()
   printf("Options:\n");
   printf("  -h    Show this help text\n");
   printf("  -q    No output to standard output\n");
+  printf("  -o <outfile>  File to generate output to (def. testgedcom.out)\n");
 }
 
 int test_xref_functions()
@@ -151,6 +136,7 @@ int test_xref_functions()
 int main(int argc, char* argv[])
 {
   int result;
+  char* outfilename = NULL;
   
   if (argc > 1) {
     int i;
@@ -160,7 +146,18 @@ int main(int argc, char* argv[])
        exit(1);
       }
       else if (!strncmp(argv[i], "-q", 3)) {
-       quiet = 1;
+       output_set_quiet(1);
+      }
+      else if (!strncmp(argv[i], "-o", 3)) {
+       i++;
+       if (i < argc) {
+         outfilename = argv[i];
+       }
+       else {
+         printf ("Missing output file name\n");
+         show_help();
+         exit(1);
+       }
       }
       else {
        printf ("Unrecognized option: %s\n", argv[i]);
@@ -173,21 +170,19 @@ int main(int argc, char* argv[])
   gedcom_init();
   setlocale(LC_ALL, "");
   gedcom_set_message_handler(gedcom_message_handler);
-  
-  outfile = fopen(OUTFILE, "a");
-  if (!outfile) {
-    printf("Could not open %s for appending\n", OUTFILE);
-  }
+
+  output_open(outfilename);
   
   result = gedcom_new_model();
-  result |= test_xref_functions();
+  if (result == 0)
+    result |= test_xref_functions();
   if (result == 0) {
     output(1, "Test succeeded\n");
   }
   else {
     output(1, "Test failed: %d\n", result);
   }
-  
-  fclose(outfile);
+
+  output_close();
   return result;
 }