summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2003-01-03 18:32:54 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2003-01-03 18:32:54 +0000
commit6e2cf720de331e0aae77cae81de6cddce2330c5c (patch)
tree86392e13b18eecff94f4f85c334daef82ce2d61f /test
parent767ae144bb6e8059886608da4039ce9bfa3810e3 (diff)
downloadlibapr-6e2cf720de331e0aae77cae81de6cddce2330c5c.tar.gz
Must ... have ... extensions
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64264 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rw-r--r--test/testoc.c13
-rw-r--r--test/testproc.c2
2 files changed, 12 insertions, 3 deletions
diff --git a/test/testoc.c b/test/testoc.c
index 0aba965bd..e67240e1f 100644
--- a/test/testoc.c
+++ b/test/testoc.c
@@ -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 @@ static void test_child_kill(CuTest *tc)
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 @@ static void test_child_kill(CuTest *tc)
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);
diff --git a/test/testproc.c b/test/testproc.c
index 3da9acd13..4bd223845 100644
--- a/test/testproc.c
+++ b/test/testproc.c
@@ -94,7 +94,7 @@ static void test_create_proc(CuTest *tc)
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,