[csw-devel] SF.net SVN: gar:[10742] csw/mgar/pkg/apr/trunk

[dmichelsen at users.sourceforge.net]

Revision: 10742
          http://gar.svn.sourceforge.net/gar/?rev=10742&view=rev
Author:   dmichelsen
Date:     2010-08-14 21:50:53 +0000 (Sat, 14 Aug 2010)

Log Message:
-----------
apr: Fix 64 bit testcase to link testsuite against newly built lib

Modified Paths:
--------------
    csw/mgar/pkg/apr/trunk/Makefile
    csw/mgar/pkg/apr/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch

Modified: csw/mgar/pkg/apr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr/trunk/Makefile	2010-08-14 21:36:55 UTC (rev 10741)
+++ csw/mgar/pkg/apr/trunk/Makefile	2010-08-14 21:50:53 UTC (rev 10742)
@@ -11,6 +11,9 @@
 
 MASTER_SITES = http://apache.crihan.fr/dist/apr/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+
+PATCHFILES = 0001-Force-newly-built-libs-in-testsuite.patch
+
 LICENSE = LICENSE
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -24,4 +27,19 @@
 
 TEST_TARGET = check
 
+# Make sure for the tests the local libs are preferred, especially for 'testall'.
+# Otherwise these tests are failing:
+#
+# testfmt             : \Line 52: expected <0>, but saw <%ld>
+# \Line 74: expected <0>, but saw <%ld>
+# /Line 85: expected <14000000>, but saw <%lu>
+# \Line 96: expected <d59f80>, but saw <%lx>
+# |Line 108: expected <-42>, but saw <%ld>
+# FAILED 5 of 9
+
+LD_LIBRARY_PATH=../.lib
+export LD_LIBRARY_PATH
+EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH
+
 include gar/category.mk
+

Modified: csw/mgar/pkg/apr/trunk/checksums
===================================================================
--- csw/mgar/pkg/apr/trunk/checksums	2010-08-14 21:36:55 UTC (rev 10741)
+++ csw/mgar/pkg/apr/trunk/checksums	2010-08-14 21:50:53 UTC (rev 10742)
@@ -1 +1,2 @@
+700afb2b78a496891aa1243ad6830a15  0001-Force-newly-built-libs-in-testsuite.patch
 fc80cb54f158c2674f9eeb47a1f672cd  apr-1.4.2.tar.gz

Added: csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch
===================================================================
--- csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch	                        (rev 0)
+++ csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch	2010-08-14 21:50:53 UTC (rev 10742)
@@ -0,0 +1,25 @@
+From 7cb4c8dbf352acddec4c68d53cfa4633ba80c61d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 14 Aug 2010 23:27:50 +0200
+Subject: [PATCH] Force newly built libs in testsuite
+
+---
+ test/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/test/Makefile.in b/test/Makefile.in
+index b371074..63b3d35 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -162,7 +162,7 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+ 	teststatus=0; \
+ 	progfailed=""; \
+ 	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
+-		./$$prog; \
++		LD_LIBRARY_PATH=../.libs ./$$prog; \
+ 		status=$$?; \
+ 		if test $$status != 0; then \
+ 			teststatus=$$status; \
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.