summaryrefslogtreecommitdiff
path: root/test/Makefile.in
diff options
context:
space:
mode:
authorrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2004-03-15 18:33:30 +0000
committerrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2004-03-15 18:33:30 +0000
commitdc9be10350c1fa61546d3ff57d1f0e3429945d20 (patch)
treeb8f7ae3bf08d7fed3a0386d7c301643f0bf59ecb /test/Makefile.in
parent1ec398addc91727115b658d0c078b7c261db362b (diff)
downloadlibapr-dc9be10350c1fa61546d3ff57d1f0e3429945d20.tar.gz
Port testglobalmutex to the unified framework. There is a hack in
globalmutexchild.c in that we create the mutex before we call child_init. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64999 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/Makefile.in')
-rw-r--r--test/Makefile.in14
1 files changed, 6 insertions, 8 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 765d34242..a227cd39e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -17,9 +17,6 @@ STDTEST_PORTABLE = \
testmutexscope@EXEEXT@ \
testall@EXEEXT@
-STDTEST_NONPORTABLE = \
- testglobalmutex@EXEEXT@
-
OTHER_PROGRAMS = sendfile@EXEEXT@
PROGRAMS = $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS)
@@ -60,6 +57,9 @@ sockchild@EXEEXT@: sockchild.lo $(LOCAL_LIBS)
readchild@EXEEXT@: readchild.lo $(LOCAL_LIBS)
$(LINK_PROG) readchild.lo $(LOCAL_LIBS) $(ALL_LIBS)
+globalmutexchild@EXEEXT@: globalmutexchild.lo $(LOCAL_LIBS)
+ $(LINK_PROG) globalmutexchild.lo $(LOCAL_LIBS) $(ALL_LIBS)
+
tryread@EXEEXT@: tryread.lo $(LOCAL_LIBS)
$(LINK_PROG) tryread.lo $(LOCAL_LIBS) $(ALL_LIBS)
@@ -91,9 +91,6 @@ testshmconsumer@EXEEXT@: testshmconsumer.lo $(LOCAL_LIBS)
testprocmutex@EXEEXT@: testprocmutex.lo $(LOCAL_LIBS)
$(LINK_PROG) testprocmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
-testglobalmutex@EXEEXT@: testglobalmutex.lo $(LOCAL_LIBS)
- $(LINK_PROG) testglobalmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
testmutexscope@EXEEXT@: testmutexscope.lo $(LOCAL_LIBS)
$(LINK_PROG) testmutexscope.lo $(LOCAL_LIBS) $(ALL_LIBS)
@@ -104,11 +101,12 @@ TESTS = testall.lo testtime.lo teststr.lo testvsn.lo testipsub.lo \
testpoll.lo testlock.lo testsockopt.lo testpipe.lo testthread.lo \
testhash.lo testargs.lo testnames.lo testuser.lo testpath.lo \
testenv.lo testprocmutex.lo testrand2.lo testfnmatch.lo \
- testatomic.lo testflock.lo testshm.lo testsock.lo
+ testatomic.lo testflock.lo testshm.lo testsock.lo testglobalmutex.lo
testall: $(TESTS) mod_test.la libmod_test.la occhild@EXEEXT@ \
readchild@EXEEXT@ CuTest.lo proc_child@EXEEXT@ \
- tryread@EXEEXT@ sockchild@EXEEXT@ $(LOCAL_LIBS)
+ tryread@EXEEXT@ sockchild@EXEEXT@ globalmutexchild@EXEEXT@ \
+ $(LOCAL_LIBS)
$(LINK_PROG) $(TESTS) CuTest.lo $(LOCAL_LIBS) $(ALL_LIBS)