[jbossnative-commits] JBoss Native SVN: r2211 - in trunk: mod_cluster/test/java and 1 other directory.
Author: jfrederic.clere(a)jboss.com
Date: 2009-01-26 05:12:24 -0500 (Mon, 26 Jan 2009)
New Revision: 2211
Modified:
trunk/build/unix/buildtest.mod_cluster.sh
trunk/mod_cluster/test/java/installhttpd.sh
Log:
When calling by hudson Use our local build for tests.
Modified: trunk/build/unix/buildtest.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildtest.mod_cluster.sh 2009-01-26 08:42:51 UTC (rev 2210)
+++ trunk/build/unix/buildtest.mod_cluster.sh 2009-01-26 10:12:24 UTC (rev 2211)
@@ -42,6 +42,9 @@
# the stuff is in
/home/jfclere/jbossnative/trunk/build/unix/work/mod_cluster-1.0.0.dev-src/srclib/mod_cluster/src/test/java
# $root is
/home/jfclere/jbossnative/trunk/build/unix/work/mod_cluster-1.0.0.dev-src/output/linux2-x64
anttestsdir=`cd $root/../../srclib/mod_cluster/test/java; pwd`
+BUILDTEST=Y
+export BUILDTEST
+export root
(cd $anttestsdir
ant
) || exit 1
Modified: trunk/mod_cluster/test/java/installhttpd.sh
===================================================================
--- trunk/mod_cluster/test/java/installhttpd.sh 2009-01-26 08:42:51 UTC (rev 2210)
+++ trunk/mod_cluster/test/java/installhttpd.sh 2009-01-26 10:12:24 UTC (rev 2211)
@@ -115,6 +115,9 @@
# Something like (note don't use ssl for the moment.
#
http://hudson.qa.jboss.com/hudson/view/Native/job/mod_cluster-linux-x86_6...
#
http://hudson.qa.jboss.com/hudson/view/Native/job/mod_cluster-solaris-x86...
+# The result of the build is something like:
+#
/qa/services/hudson/hudson_workspace/workspace/mod_cluster-linux-i686/jbossnative/build/unix/output/mod_cluster-1.0.0.dev-linux2-x86.tar.gz
+#
TARBALL=http://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuc...
BASELOC=`ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::'`
if [ "x${BASELOC}" = "x" ]
@@ -125,8 +128,14 @@
ant downloadfile -Dsourcefile=${TARBALL}
-Ddestfile=${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir=$BASELOC
fi
else
- rm -f ${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
- ant downloadfile -Dsourcefile=${TARBALL}
-Ddestfile=${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir=$BASELOC
+ if [ "x${BASELOC}" = "x" ]
+ then
+ rm -f ${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT}
+ ant downloadfile -Dsourcefile=${TARBALL}
-Ddestfile=${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT} -Ddestdir=$BASELOC
+ else
+ echo "Using $root/${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT}"
+ cp -p $root/${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT} .
+ fi
fi
TARBALL=`pwd`/${PACKAGE}-${BUILD_SYS}-${BUILD_CPU}.${EXT}