apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r588397 - /apr/apr/branches/1.2.x/test/Makefile.in
Date Thu, 25 Oct 2007 23:57:31 GMT
Author: wrowe
Date: Thu Oct 25 16:57:30 2007
New Revision: 588397

URL: http://svn.apache.org/viewvc?rev=588397&view=rev
Log:
Reorder targets (drop unused testprocmutex target) as on trunk to make
it simpler to follow how to add a target.

Modified:
    apr/apr/branches/1.2.x/test/Makefile.in

Modified: apr/apr/branches/1.2.x/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/test/Makefile.in?rev=588397&r1=588396&r2=588397&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/test/Makefile.in (original)
+++ apr/apr/branches/1.2.x/test/Makefile.in Thu Oct 25 16:57:30 2007
@@ -17,6 +17,16 @@
 	testmutexscope@EXEEXT@ \
 	testall@EXEEXT@
 
+TESTS = testtime.lo teststr.lo testvsn.lo testipsub.lo \
+	testmmap.lo testud.lo testtable.lo testsleep.lo testpools.lo \
+	testfmt.lo testfile.lo testdir.lo testfileinfo.lo testrand.lo \
+	testdso.lo testoc.lo testdup.lo testsockets.lo testproc.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 testglobalmutex.lo \
+        teststrnatcmp.lo testfilecopy.lo testtemp.lo testlfs.lo
+
 OTHER_PROGRAMS = \
         sendfile@EXEEXT@ \
 	testshmproducer@EXEEXT@ \
@@ -56,14 +66,7 @@
 LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) \
 	@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
 
-check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
-	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
-		./$$prog; \
-		if test $$? = 255; then \
-			echo "$$prog failed"; \
-			break; \
-		fi; \
-	done
+# STDTEST_PORTABLE;
 
 abts.lo: $(srcdir)/abts.c $(srcdir)/abts.h $(srcdir)/abts_tests.h \
 	 $(srcdir)/testutil.h
@@ -71,22 +74,26 @@
 testutil.lo: $(srcdir)/abts.c $(srcdir)/abts.h $(srcdir)/abts_tests.h \
 	     $(srcdir)/testutil.h
 
-occhild@EXEEXT@: occhild.lo $(LOCAL_LIBS)
+testall@EXEEXT@: $(TESTS) abts.lo testutil.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
+# For VPATH builds; where we have no ./data, copy us some data
+# if we wait until 'make check', then 'make; ./testall' fails;
+	if test ! -d "./data"; then cp -r $(srcdir)/data data; fi
 
-sockchild@EXEEXT@: sockchild.lo $(LOCAL_LIBS)
+testlockperf@EXEEXT@: testlockperf.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
 
-readchild@EXEEXT@: readchild.lo $(LOCAL_LIBS)
+testmutexscope@EXEEXT@: testmutexscope.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
 
-globalmutexchild@EXEEXT@: globalmutexchild.lo $(LOCAL_LIBS)
-	$(LINK_PROG) $+ $(ALL_LIBS)
+# OTHER_PROGRAMS;
 
-tryread@EXEEXT@: tryread.lo $(LOCAL_LIBS)
+sendfile@EXEEXT@: sendfile.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
 
-proc_child@EXEEXT@: proc_child.lo $(LOCAL_LIBS)
+# TESTALL_COMPONENTS;
+
+globalmutexchild@EXEEXT@: globalmutexchild.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
 
 # Note: -prefer-pic is only supported with libtool-1.4+
@@ -101,38 +108,34 @@
 	$(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` \
 	  -avoid-version $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $+ $(ALL_LIBS)
 
-testlockperf@EXEEXT@: testlockperf.lo $(LOCAL_LIBS)
+occhild@EXEEXT@: occhild.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
 
-sendfile@EXEEXT@: sendfile.lo $(LOCAL_LIBS)
+proc_child@EXEEXT@: proc_child.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
 
-testshmproducer@EXEEXT@: testshmproducer.lo $(LOCAL_LIBS)
+readchild@EXEEXT@: readchild.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
 
-testshmconsumer@EXEEXT@: testshmconsumer.lo $(LOCAL_LIBS)
+sockchild@EXEEXT@: sockchild.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
 
-testprocmutex@EXEEXT@: testprocmutex.lo $(LOCAL_LIBS)
+testshmconsumer@EXEEXT@: testshmconsumer.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
 
-testmutexscope@EXEEXT@: testmutexscope.lo $(LOCAL_LIBS)
+testshmproducer@EXEEXT@: testshmproducer.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
 
-TESTS = testtime.lo teststr.lo testvsn.lo testipsub.lo \
-	testmmap.lo testud.lo testtable.lo testsleep.lo testpools.lo \
-	testfmt.lo testfile.lo testdir.lo testfileinfo.lo testrand.lo \
-	testdso.lo testoc.lo testdup.lo testsockets.lo testproc.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 testglobalmutex.lo \
-        teststrnatcmp.lo testfilecopy.lo testtemp.lo testlfs.lo
-
-testall@EXEEXT@: $(TESTS) abts.lo testutil.lo $(LOCAL_LIBS)
+tryread@EXEEXT@: tryread.lo $(LOCAL_LIBS)
 	$(LINK_PROG) $+ $(ALL_LIBS)
-# For VPATH builds; where we have no ./data, copy us some data
-# if we wait until 'make check', then 'make; ./testall' fails;
-	if test ! -d "./data"; then cp -r $(srcdir)/data data; fi
+
+check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
+		./$$prog; \
+		if test $$? = 255; then \
+			echo "$$prog failed"; \
+			break; \
+		fi; \
+	done
 
 # DO NOT REMOVE



Mime
View raw message