From commits-return-10544-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Mon Jun 29 01:19:34 2009 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 19693 invoked from network); 29 Jun 2009 01:19:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Jun 2009 01:19:34 -0000 Received: (qmail 11364 invoked by uid 500); 29 Jun 2009 01:19:45 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 11266 invoked by uid 500); 29 Jun 2009 01:19:44 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 11257 invoked by uid 99); 29 Jun 2009 01:19:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2009 01:19:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jun 2009 01:19:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7C83F2388896; Mon, 29 Jun 2009 01:19:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r789182 - in /apr/apr/trunk: NWGNUmakefile test/NWGNUaprtest test/NWGNUmakefile Date: Mon, 29 Jun 2009 01:19:22 -0000 To: commits@apr.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090629011922.7C83F2388896@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fuankg Date: Mon Jun 29 01:19:21 2009 New Revision: 789182 URL: http://svn.apache.org/viewvc?rev=789182&view=rev Log: first try to fix the tests for NetWare. Modified: apr/apr/trunk/NWGNUmakefile apr/apr/trunk/test/NWGNUaprtest apr/apr/trunk/test/NWGNUmakefile Modified: apr/apr/trunk/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=789182&r1=789181&r2=789182&view=diff ============================================================================== --- apr/apr/trunk/NWGNUmakefile (original) +++ apr/apr/trunk/NWGNUmakefile Mon Jun 29 01:19:21 2009 @@ -417,6 +417,9 @@ $(CHKNOT) $@\NUL mkdir $@ endif +test :: nlms FORCE + $(MAKE) -C $(APRTEST) -f NWGNUmakefile + # # Any specialized rules here # Modified: apr/apr/trunk/test/NWGNUaprtest URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUaprtest?rev=789182&r1=789181&r2=789182&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUaprtest (original) +++ apr/apr/trunk/test/NWGNUaprtest Mon Jun 29 01:19:21 2009 @@ -18,6 +18,7 @@ XINCDIRS += \ $(APR)/include \ $(APR)/include/arch/NetWare \ + $(LDAPSDK)/inc \ $(EOLIST) # @@ -89,12 +90,12 @@ # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME =aprtest +NLM_NAME = aprtest # # This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # -NLM_DESCRIPTION = NLM is to test the apr layer +NLM_DESCRIPTION = NLM is to test the apr layer # # This is used by the '-threadname' directive. If left blank, @@ -106,18 +107,18 @@ # This is used by the '-screenname' directive. If left blank, # 'Apache for NetWare' Thread will be used. # -NLM_SCREEN_NAME = aprtest +NLM_SCREEN_NAME = aprtest # # If this is specified, it will override VERSION value in # $(APR_WORK)/build/NWGNUenvironment.inc # -NLM_VERSION = 1,0,0 +NLM_VERSION = # # If this is specified, it will override the default of 64K # -NLM_STACK_SIZE = 524288 +NLM_STACK_SIZE = 524288 # # If this is specified it will be used by the link '-entry' directive @@ -137,14 +138,14 @@ # # If this is specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can # be disabled by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # Declare all target files (you must add your files here) @@ -154,7 +155,7 @@ # If there is an NLM target, put it here # TARGET_nlm = \ - $(OBJDIR)/aprtest.nlm \ + $(OBJDIR)/$(NLM_NAME).nlm \ $(EOLIST) # @@ -172,6 +173,13 @@ $(OBJDIR)/abts.o \ $(OBJDIR)/testargs.o \ $(OBJDIR)/testatomic.o \ + $(OBJDIR)/testbase64.o \ + $(OBJDIR)/testbuckets.o \ + $(OBJDIR)/testcond.o \ + $(OBJDIR)/testcrypto.o \ + $(OBJDIR)/testdate.o \ + $(OBJDIR)/testdbd.o \ + $(OBJDIR)/testdbm.o \ $(OBJDIR)/testdir.o \ $(OBJDIR)/testdup.o \ $(OBJDIR)/testdso.o \ @@ -184,40 +192,53 @@ $(OBJDIR)/testfnmatch.o \ $(OBJDIR)/testglobalmutex.o \ $(OBJDIR)/testhash.o \ + $(OBJDIR)/testhooks.o \ $(OBJDIR)/testipsub.o \ + $(OBJDIR)/testldap.o \ $(OBJDIR)/testlfs.o \ $(OBJDIR)/testlock.o \ - $(OBJDIR)/testcond.o \ + $(OBJDIR)/testmd4.o \ + $(OBJDIR)/testmd5.o \ $(OBJDIR)/testmmap.o \ + $(OBJDIR)/testmemcache.o \ $(OBJDIR)/testnames.o \ $(OBJDIR)/testoc.o \ + $(OBJDIR)/testpass.o \ $(OBJDIR)/testpath.o \ $(OBJDIR)/testpipe.o \ $(OBJDIR)/testpoll.o \ $(OBJDIR)/testpools.o \ $(OBJDIR)/testproc.o \ $(OBJDIR)/testprocmutex.o \ + $(OBJDIR)/testqueue.o \ + $(OBJDIR)/testreslist.o \ $(OBJDIR)/testrand.o \ + $(OBJDIR)/testrmm.o \ $(OBJDIR)/testshm.o \ $(OBJDIR)/testsleep.o \ $(OBJDIR)/testsock.o \ $(OBJDIR)/testsockets.o \ $(OBJDIR)/testsockopt.o \ $(OBJDIR)/teststr.o \ + $(OBJDIR)/teststrmatch.o \ $(OBJDIR)/teststrnatcmp.o \ $(OBJDIR)/testtable.o \ $(OBJDIR)/testtemp.o \ $(OBJDIR)/testthread.o \ $(OBJDIR)/testtime.o \ $(OBJDIR)/testud.o \ + $(OBJDIR)/testuri.o \ $(OBJDIR)/testuser.o \ $(OBJDIR)/testutil.o \ + $(OBJDIR)/testuuid.o \ $(OBJDIR)/testvsn.o \ + $(OBJDIR)/testxml.o \ + $(OBJDIR)/testxlate.o \ $(OBJDIR)/nw_misc.o \ $(EOLIST) # Pending tests - + # # These are the LIB files needed to create the NLM target above. # These will be added as a library command in the link.opt file. @@ -255,9 +276,27 @@ # FILES_nlm_Ximports = \ @libc.imp \ + @netware.imp \ @$(APR)/aprlib.imp \ $(EOLIST) +# Include the Winsock imports if Winsock is being used +ifndef USE_STDSOCKETS +FILES_nlm_Ximports += \ + @ws2nlm.imp \ + WSAStartupRTags \ + WSACleanupRTag \ + $(EOLIST) +endif + +#If the LDAP support is defined then add the imports +ifneq "$(LDAPSDK)" "" +FILES_nlm_Ximports += \ + @$(LDAPSDK)/imports/lldapsdk.imp \ + @$(LDAPSDK)/imports/lldapssl.imp \ + $(EOLIST) +endif + # # Any symbols exported to here # Modified: apr/apr/trunk/test/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUmakefile?rev=789182&r1=789181&r2=789182&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUmakefile (original) +++ apr/apr/trunk/test/NWGNUmakefile Mon Jun 29 01:19:21 2009 @@ -25,8 +25,6 @@ # INCDIRS # XINCDIRS += \ - $(APR)/include \ - $(APR)/include/arch/NetWare \ $(EOLIST) # @@ -63,7 +61,6 @@ XLFLAGS += \ $(EOLIST) - endif ifeq "$(RELEASE)" "noopt" @@ -99,7 +96,7 @@ # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = +NLM_NAME = # # This is used by the link '-desc ' directive. @@ -123,7 +120,7 @@ # If this is specified, it will override VERSION value in # $(APR_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -148,14 +145,14 @@ # # If this is specified it will be used by the link '-flags' directive # -NLM_FLAGS = +NLM_FLAGS = # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can # be disabled by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # Declare all target files (you must add your files here) @@ -185,14 +182,14 @@ # Paths must all use the '/' character # FILES_nlm_objs = \ - $(EOLIST) + $(EOLIST) # # These are the LIB files needed to create the NLM target above. # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - $(EOLIST) + $(EOLIST) # # These are the modules that the above NLM target depends on to load. @@ -200,7 +197,7 @@ # FILES_nlm_modules = \ aprlib \ - $(EOLIST) + $(EOLIST) # # If the nlm has a msg file, put it's path here @@ -221,14 +218,14 @@ # Any additional imports go here # FILES_nlm_Ximports = \ - $(EOLIST) + $(EOLIST) # # Any symbols exported to here # FILES_nlm_exports = \ $(EOLIST) - + # # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character