From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 20 Mar 2012 16:31:41 +0000 (+0000)
Subject: Tests portability.
X-Git-Tag: glite-jobid-api-c_R_2_1_2_1~25
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=182fc47a215f90f75ec3f682e785b11be5a768ad;p=jra1mw.git

Tests portability.
---

diff --git a/org.glite.jobid.api-c/Makefile b/org.glite.jobid.api-c/Makefile
index b72e1a9..8c1cbde 100644
--- a/org.glite.jobid.api-c/Makefile
+++ b/org.glite.jobid.api-c/Makefile
@@ -36,7 +36,12 @@ LIBLOBJS:=${LIBOBJS:.o=.lo}
 
 LIB:=libglite_jobid.la
 
-TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit -ldl
+os=${shell uname}
+DL_LIBS:=
+ifeq (${os},Linux)
+	DL_LIBS:=-ldl
+endif
+TEST_LIBS:=-L${cppunit_prefix}/${libdir} -lcppunit ${DL_LIBS}
 TEST_INC:=-I${cppunit_prefix}/include
 
 compile all: ${LIB}
diff --git a/org.glite.lbjp-common.server-bones/examples/run_test.sh b/org.glite.lbjp-common.server-bones/examples/run_test.sh
index d21b8a2..4416609 100644
--- a/org.glite.lbjp-common.server-bones/examples/run_test.sh
+++ b/org.glite.lbjp-common.server-bones/examples/run_test.sh
@@ -16,7 +16,7 @@ ret2=$?
 
 kill -SIGTERM $SRV_PID
 
-n=`grep 'disconnect handler' /tmp/log.$$ | wc -l`
+n=`grep 'disconnect handler' /tmp/log.$$ | wc -l | sed 's/ //g'`
 rm -f /tmp/log.$$
 
 if [ $ret1 -ne 0 -o $ret2 -ne 0 ]; then