[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r3794 - in trunk/OpenDNSSEC: . test/scripts

Jakob Schlyter jakob at kirei.se
Thu Aug 26 10:54:24 CEST 2010


Author: jakob
Date: 2010-08-26 10:54:24 +0200 (Thu, 26 Aug 2010)
New Revision: 3794

Modified:
   trunk/OpenDNSSEC/configure.ac
   trunk/OpenDNSSEC/test/scripts/simulate_hudson.sh
Log:
tweek to WITH_CUNIT

Modified: trunk/OpenDNSSEC/configure.ac
===================================================================
--- trunk/OpenDNSSEC/configure.ac	2010-08-26 08:48:58 UTC (rev 3793)
+++ trunk/OpenDNSSEC/configure.ac	2010-08-26 08:54:24 UTC (rev 3794)
@@ -164,7 +164,7 @@
 AM_CONDITIONAL([ENABLE_ENFORCER], [test "${enable_signer}" = "yes"])
 
 # cunit
-AM_CONDITIONAL([WITH_CUNIT], [test "${with_cunit}" != "no"])
+AM_CONDITIONAL([WITH_CUNIT], [test "${with_cunit}" != "no" -a -n "$CUNIT_LIBS"])
 
 # signer
 AC_ARG_ENABLE(signer,

Modified: trunk/OpenDNSSEC/test/scripts/simulate_hudson.sh
===================================================================
--- trunk/OpenDNSSEC/test/scripts/simulate_hudson.sh	2010-08-26 08:48:58 UTC (rev 3793)
+++ trunk/OpenDNSSEC/test/scripts/simulate_hudson.sh	2010-08-26 08:54:24 UTC (rev 3794)
@@ -5,10 +5,16 @@
 WORKSPACE=${HOME}/tmp/workspace
 export WORKSPACE
 
-rm -fr WORKSPACE
+SCRIPTS=`pwd`
+
+rm -fr $WORKSPACE
 mkdir -p $WORKSPACE
 
 cd $WORKSPACE
 svn export http://svn.opendnssec.org/trunk/OpenDNSSEC src
 
-sh -vx src/test/scripts/build_and_test.sh
+if [ "$1" = "--local" ]; then
+	sh -vx $SCRIPTS/build_and_test.sh
+else
+	sh -vx src/test/scripts/build_and_test.sh
+fi




More information about the Opendnssec-commits mailing list