You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2003/01/03 19:32:55 UTC
cvs commit: apr/test testproc.c testoc.c
wrowe 2003/01/03 10:32:55
Modified: test testproc.c testoc.c
Log:
Must ... have ... extensions
Revision Changes Path
1.42 +1 -1 apr/test/testproc.c
Index: testproc.c
===================================================================
RCS file: /home/cvs/apr/test/testproc.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- testproc.c 1 Jan 2003 00:01:56 -0000 1.41
+++ testproc.c 3 Jan 2003 18:32:54 -0000 1.42
@@ -94,7 +94,7 @@
rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
- args[0] = "proc_child";
+ args[0] = "proc_child" EXTENSION;
args[1] = NULL;
rv = apr_proc_create(&newproc, "../proc_child" EXTENSION, args, NULL,
1.31 +11 -2 apr/test/testoc.c
Index: testoc.c
===================================================================
RCS file: /home/cvs/apr/test/testoc.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- testoc.c 1 Jan 2003 00:01:56 -0000 1.30
+++ testoc.c 3 Jan 2003 18:32:54 -0000 1.31
@@ -61,6 +61,15 @@
#if APR_HAS_OTHER_CHILD
+/* XXX I'm sure there has to be a better way to do this ... */
+#ifdef WIN32
+#define EXTENSION ".exe"
+#elif NETWARE
+#define EXTENSION ".nlm"
+#else
+#define EXTENSION
+#endif
+
static char reasonstr[256];
static void ocmaint(int reason, void *data, int status)
@@ -100,7 +109,7 @@
const char *args[3];
apr_status_t rv;
- args[0] = apr_pstrdup(p, "occhild");
+ args[0] = apr_pstrdup(p, "occhild" EXTENSION);
args[1] = apr_pstrdup(p, "-X");
args[2] = NULL;
@@ -111,7 +120,7 @@
APR_NO_PIPE);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
- rv = apr_proc_create(&newproc, "./occhild", args, NULL, procattr, p);
+ rv = apr_proc_create(&newproc, "./occhild" EXTENSION, args, NULL, procattr, p);
CuAssertIntEquals(tc, APR_SUCCESS, rv);
CuAssertPtrNotNull(tc, newproc.in);
CuAssertPtrEquals(tc, NULL, newproc.out);