inf-test-text-replay: Allow multiple record files

2008-12-13 Armin Burgmeier <[email protected]> * test/inf-test-text-replay.c: Allow multiple record files to be passed.
pkern · Dec 13, 2008 · e82808e · e82808e
1 parent 55bf10f
commit e82808e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 20 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-13  Armin Burgmeier  <[email protected]>
+
+	* test/inf-test-text-replay.c: Allow multiple record files to be
+	passed.
+
 2008-12-07  Armin Burgmeier  <[email protected]>
 
 	* infinoted/infinoted-run.c: Record sessions into

diff --git a/test/inf-test-text-replay.c b/test/inf-test-text-replay.c
@@ -701,9 +701,8 @@ inf_test_text_replay_process(xmlTextReaderPtr reader)
   }
   else
   {
-    inf_test_util_print_buffer(buffer);
-    /*inf_test_text_replay_print_buffer(buffer);*/
-    printf("Replayed record successfully\n");
+    /*inf_test_util_print_buffer(buffer);*/
+    fprintf(stderr, "Replayed record successfully\n");
   }
 
   g_object_unref(buffer);
@@ -712,38 +711,46 @@ inf_test_text_replay_process(xmlTextReaderPtr reader)
 int main(int argc, char* argv[])
 {
   xmlTextReaderPtr reader;
+  int i;
 
   g_type_init();
   inf_test_text_replay_error_quark =
     g_quark_from_static_string("INF_TEST_TEXT_REPLAY_ERROR");
 
   if(argc < 2)
   {
-    fprintf(stderr, "Usage: %s <record-file>\n", argv[0]);
+    fprintf(stderr, "Usage: %s <record-file1> <record-file2> ...\n", argv[0]);
     return -1;
   }
 
-  reader = xmlReaderForFile(
-    argv[1],
-    NULL,
-    XML_PARSE_NOERROR | XML_PARSE_NOWARNING
-  );
-
-  if(!reader)
+  for(i = 1; i < argc; ++ i)
   {
-    fprintf(stderr, "%s\n", xmlGetLastError()->message);
-    return -1;
-  }
+    fprintf(stderr, "%s...", argv[i]);
+    fflush(stderr);
 
-  inf_test_text_replay_process(reader);
+    reader = xmlReaderForFile(
+      argv[i],
+      NULL,
+      XML_PARSE_NOERROR | XML_PARSE_NOWARNING
+    );
 
-  if(xmlTextReaderClose(reader) == -1)
-  {
-    fprintf(stderr, "%s\n", xmlGetLastError()->message);
-    return -1;
+    if(!reader)
+    {
+      fprintf(stderr, "%s\n", xmlGetLastError()->message);
+      return -1;
+    }
+
+    inf_test_text_replay_process(reader);
+
+    if(xmlTextReaderClose(reader) == -1)
+    {
+      fprintf(stderr, "%s\n", xmlGetLastError()->message);
+      return -1;
+    }
+
+    xmlFreeTextReader(reader);
   }
 
-  xmlFreeTextReader(reader);
   return 0;
 }
 /* vim:set et sw=2 ts=2: */