Changeset 97cdbaf5 for tester.c

Timestamp:

Mar 11, 2012, 10:57:35 PM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

a03a409

Parents:

1f39ded

git-author:

David Benjamin <davidben@mit.edu> (01/23/12 00:38:29)

git-committer:

David Benjamin <davidben@mit.edu> (03/11/12 22:57:35)

Message:

Rewrite call_filter to use g_spawn_async_with_pipes

This simplifies the error-handling code. Also fixes a bug where file
descriptors get double-closed in call_filter. Also adds a unit test. The
separate prog argument is removed to avoid having to deal with
G_SPAWN_FILE_AND_ARGV_ZERO, and since we don't really use it anyway.

File:

• tester.c (modified) (4 diffs)

tester.c

@@ -3 +3 @@
 #include "owl.h"
 #undef WINDOW
+#include "filterproc.h"
 
 #include <stdio.h>
@@ -23 +24 @@
 int owl_smartfilter_regtest(void);
 int owl_history_regtest(void);
+int call_filter_regtest(void);
 
 extern void owl_perl_xs_init(pTHX);
@@ -113 +115 @@
   numfailures += owl_smartfilter_regtest();
   numfailures += owl_history_regtest();
+  numfailures += call_filter_regtest();
   if (numfailures) {
       fprintf(stderr, "# *** WARNING: %d failures total\n", numfailures);
@@ -981 +984 @@
   return numfailed;
 }
+
+int call_filter_regtest(void)
+{
+  int numfailed = 0;
+  int ret;
+  char *out = NULL;
+  int status;
+
+  printf("# BEGIN testing call_filter\n");
+
+  const char *cat_argv[] = { "cat", NULL };
+  ret = call_filter(cat_argv, "Mangos!", &out, &status);
+  FAIL_UNLESS("call_filter cat", (ret == 0 &&
+                                  status == 0 &&
+                                  strcmp(out, "Mangos!") == 0));
+  g_free(out); out = NULL;
+
+  ret = call_filter(cat_argv, "", &out, &status);
+  FAIL_UNLESS("call_filter cat", (ret == 0 &&
+                                  status == 0 &&
+                                  strcmp(out, "") == 0));
+  g_free(out); out = NULL;
+
+  ret = call_filter(cat_argv, NULL, &out, &status);
+  FAIL_UNLESS("call_filter cat", (ret == 0 &&
+                                  status == 0 &&
+                                  strcmp(out, "") == 0));
+  g_free(out); out = NULL;
+
+  printf("# END testing call_filter (%d failures)\n", numfailed);
+  return numfailed;
+}