apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r585422 - in /apr/apr-util/branches/1.2.x/test: Makefile.in Makefile.win abts_tests.h testdate.c testdbm.c testqueue.c testreslist.c testrmm.c testutil.h testxlate.c testxml.c
Date Wed, 17 Oct 2007 09:08:08 GMT
Author: wrowe
Date: Wed Oct 17 02:08:07 2007
New Revision: 585422

URL: http://svn.apache.org/viewvc?rev=585422&view=rev
Log:
Sync up what's found in trunk for these, replacing the
noisy garbage previously distributed to unsuspecting users.

Added:
    apr/apr-util/branches/1.2.x/test/testdate.c
      - copied unchanged from r585392, apr/apr-util/trunk/test/testdate.c
    apr/apr-util/branches/1.2.x/test/testdbm.c
      - copied unchanged from r585395, apr/apr-util/trunk/test/testdbm.c
    apr/apr-util/branches/1.2.x/test/testqueue.c
      - copied unchanged from r585421, apr/apr-util/trunk/test/testqueue.c
    apr/apr-util/branches/1.2.x/test/testreslist.c
      - copied unchanged from r585421, apr/apr-util/trunk/test/testreslist.c
    apr/apr-util/branches/1.2.x/test/testrmm.c
      - copied unchanged from r585395, apr/apr-util/trunk/test/testrmm.c
    apr/apr-util/branches/1.2.x/test/testxlate.c
      - copied unchanged from r585395, apr/apr-util/trunk/test/testxlate.c
    apr/apr-util/branches/1.2.x/test/testxml.c
      - copied unchanged from r585395, apr/apr-util/trunk/test/testxml.c
Modified:
    apr/apr-util/branches/1.2.x/test/Makefile.in
    apr/apr-util/branches/1.2.x/test/Makefile.win
    apr/apr-util/branches/1.2.x/test/abts_tests.h
    apr/apr-util/branches/1.2.x/test/testutil.h

Modified: apr/apr-util/branches/1.2.x/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/test/Makefile.in?rev=585422&r1=585421&r2=585422&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/test/Makefile.in (original)
+++ apr/apr-util/branches/1.2.x/test/Makefile.in Wed Oct 17 02:08:07 2007
@@ -2,8 +2,7 @@
 
 INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
-PROGRAMS = testall testdbm testdate testxml testrmm \
-	   testreslist testqueue testxlate dbd
+PROGRAMS = testall dbd
 TARGETS = $(PROGRAMS)
 
 APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
@@ -48,43 +47,10 @@
 dbd: $(dbd_OBJECTS) $(dbd_LDADD)
 	$(LINK) $(APRUTIL_LDFLAGS) $(dbd_OBJECTS) $(dbd_LDADD) $(PROGRAM_DEPENDENCIES)
 
-testdbd_OBJECTS = testdbd.lo
-testdbd_LDADD =  $(TARGET_LIB_PATH)
-testdbd: $(testdbd_OBJECTS) $(testdbd_LDADD)
-	$(LINK) $(APRUTIL_LDFLAGS) $(testdbd_OBJECTS) $(testdbd_LDADD) $(PROGRAM_DEPENDENCIES)
-
-testdate_OBJECTS = testdate.lo
-testdate_LDADD =  $(TARGET_LIB_PATH)
-testdate: $(testdate_OBJECTS) $(testdate_LDADD)
-	$(LINK) $(APRUTIL_LDFLAGS) $(testdate_OBJECTS) $(testdate_LDADD) $(PROGRAM_DEPENDENCIES)
-
-testxml_OBJECTS = testxml.lo
-testxml_LDADD =  $(TARGET_LIB_PATH)
-testxml: $(testxml_OBJECTS) $(testxml_LDADD)
-	$(LINK) $(APRUTIL_LDFLAGS) $(testxml_OBJECTS) $(testxml_LDADD) $(PROGRAM_DEPENDENCIES)
-
-testrmm_OBJECTS = testrmm.lo
-testrmm_LDADD =  $(TARGET_LIB_PATH)
-testrmm: $(testrmm_OBJECTS) $(testrmm_LDADD)
-	$(LINK) $(APRUTIL_LDFLAGS) $(testrmm_OBJECTS) $(testrmm_LDADD) $(PROGRAM_DEPENDENCIES)
-
-testreslist_OBJECTS = testreslist.lo
-testreslist_LDADD =  $(TARGET_LIB_PATH)
-testreslist: $(testreslist_OBJECTS) $(testreslist_LDADD)
-	$(LINK) $(APRUTIL_LDFLAGS) $(testreslist_OBJECTS) $(testreslist_LDADD) $(PROGRAM_DEPENDENCIES)
-
-testqueue_OBJECTS = testqueue.lo
-testqueue_LDADD =  $(TARGET_LIB_PATH)
-testqueue: $(testqueue_OBJECTS) $(testqueue_LDADD)
-	$(LINK) $(APRUTIL_LDFLAGS) $(testqueue_OBJECTS) $(testqueue_LDADD) $(PROGRAM_DEPENDENCIES)
-
-testxlate_OBJECTS = testxlate.lo
-testxlate_LDADD =  $(TARGET_LIB_PATH)
-testxlate: $(testxlate_OBJECTS) $(testxlate_LDADD)
-	$(LINK) $(APRUTIL_LDFLAGS) $(testxlate_OBJECTS) $(testxlate_LDADD) $(PROGRAM_DEPENDENCIES)
-
 testall_OBJECTS = teststrmatch.lo testuri.lo testuuid.lo abts.lo testutil.lo \
-	testbuckets.lo testpass.lo testmd4.lo testmd5.lo testldap.lo testdbd.lo
+	testbuckets.lo testpass.lo testmd4.lo testmd5.lo testldap.lo testdbd.lo \
+	testdbm.lo testdate.lo testxml.lo testrmm.lo testreslist.lo testqueue.lo \
+	testxlate.lo
 testall_LDADD =  $(TARGET_LIB_PATH)
 testall: $(testall_OBJECTS) $(testall_LDADD)
 	$(LINK) $(APRUTIL_LDFLAGS) $(testall_OBJECTS) $(testall_LDADD) $(PROGRAM_DEPENDENCIES)

Modified: apr/apr-util/branches/1.2.x/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/test/Makefile.win?rev=585422&r1=585421&r2=585422&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/test/Makefile.win (original)
+++ apr/apr-util/branches/1.2.x/test/Makefile.win Wed Oct 17 02:08:07 2007
@@ -43,7 +43,11 @@
 	$(INTDIR)\testuuid.obj $(INTDIR)\testutil.obj \
 	$(INTDIR)\testbuckets.obj $(INTDIR)\testpass.obj \
 	$(INTDIR)\testmd4.obj $(INTDIR)\testmd5.obj \
-	$(INTDIR)\testldap.obj $(INTDIR)\testdbd.obj
+	$(INTDIR)\testldap.obj $(INTDIR)\testdbd.obj \
+	$(OUTDIR)\testdbm.obj $(OUTDIR)\testreslist.obj \
+	$(OUTDIR)\testxml.obj $(OUTDIR)\testqueue.obj \
+	$(OUTDIR)\testrmm.obj $(OUTDIR)\testxlate.obj \
+	$(OUTDIR)\testdate.obj
 
 CLEAN_DATA = manyfile.bin testfile.txt data\sqlite*.db
 
@@ -51,17 +55,9 @@
 
 TEST_SUBDIRS = internal
 
-PROGRAMS = $(OUTDIR)\testall.exe $(OUTDIR)\testdate.exe \
-	$(OUTDIR)\testrmm.exe $(OUTDIR)\testxlate.exe
+PROGRAMS = $(OUTDIR)\testall.exe \
 
-# testdbm needs args, belongs here
-# testreslist is broken
-# testxml is too damned noisy
-# testqueue is too damned noisy
-# dbd I just don't grok, probably belongs here though
-OTHER_PROGRAMS = $(OUTDIR)\testdbm.exe $(OUTDIR)\testreslist.exe \
-	$(OUTDIR)\testxml.exe $(OUTDIR)\testqueue.exe \
-	$(OUTDIR)\dbd.exe
+OTHER_PROGRAMS = $(OUTDIR)\dbd.exe
 
 # bring in rules.mk for standard functionality
 ALL: $(PROGRAMS)

Modified: apr/apr-util/branches/1.2.x/test/abts_tests.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/test/abts_tests.h?rev=585422&r1=585421&r2=585422&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/test/abts_tests.h (original)
+++ apr/apr-util/branches/1.2.x/test/abts_tests.h Wed Oct 17 02:08:07 2007
@@ -31,7 +31,14 @@
     {testmd4},
     {testmd5},
     {testldap},
-    {testdbd}
+    {testdbd},
+    {testdate},
+    {testreslist},
+    {testqueue},
+    {testxml},
+    {testxlate},
+    {testrmm},
+    {testdbm}
 };
 
 #endif /* APR_TEST_INCLUDES */

Modified: apr/apr-util/branches/1.2.x/test/testutil.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/test/testutil.h?rev=585422&r1=585421&r2=585422&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/test/testutil.h (original)
+++ apr/apr-util/branches/1.2.x/test/testutil.h Wed Oct 17 02:08:07 2007
@@ -52,5 +52,13 @@
 abts_suite *testmd5(abts_suite *suite);
 abts_suite *testldap(abts_suite *suite);
 abts_suite *testdbd(abts_suite *suite);
+abts_suite *testdate(abts_suite *suite);
+abts_suite *testmemcache(abts_suite *suite);
+abts_suite *testreslist(abts_suite *suite);
+abts_suite *testqueue(abts_suite *suite);
+abts_suite *testxml(abts_suite *suite);
+abts_suite *testxlate(abts_suite *suite);
+abts_suite *testrmm(abts_suite *suite);
+abts_suite *testdbm(abts_suite *suite);
 
 #endif /* APR_TEST_INCLUDES */



Mime
View raw message