Author: kylem Date: Mon Dec 20 08:31:45 2004 New Revision: 122859 URL: http://svn.apache.org/viewcvs?view=rev&rev=122859 Log: Resolved BEEHIVE-143 (ant test.dist should support linux/unix) by applying patch submitted by Bryan Che
Added: incubator/beehive/trunk/test/testDistro.sh (contents, props changed) Modified: incubator/beehive/trunk/build.xml incubator/beehive/trunk/user/beehiveUser.sh Modified: incubator/beehive/trunk/build.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?view=diff&rev=122859&p1=incubator/beehive/trunk/build.xml&r1=122858&p2=incubator/beehive/trunk/build.xml&r2=122859 ============================================================================== --- incubator/beehive/trunk/build.xml (original) +++ incubator/beehive/trunk/build.xml Mon Dec 20 08:31:45 2004 @@ -440,6 +440,7 @@ </target> <target name="test.dist" description="Tests a Beehive distribution"> + <echo>Testing distribution at ${dist.dir}</echo> <property name="distroStdout.file" location="${beehive.dir}/build/testDistro.output"/> <unzip src="${tomcat.installer}" dest="${dist.dir}"/> @@ -447,6 +448,10 @@ <arg line="/c ${os.BEEHIVE_HOME}/test/testDistro.cmd"/> <env key="dummy" value="value"/> </exec> + <exec executable="sh" dir="${dist.dir}" newenvironment="true" os="Linux,SunOS,Solaris" outputproperty="testDistro.output"> + <arg line="${os.BEEHIVE_HOME}/test/testDistro.sh"/> + <env key="dummy" value="value"/> + </exec> <fail message="${testDistro.output}"> <condition> <contains string="${testDistro.output}" substring="BUILD FAILED"/> Added: incubator/beehive/trunk/test/testDistro.sh Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/testDistro.sh?view=auto&rev=122859 ============================================================================== --- (empty file) +++ incubator/beehive/trunk/test/testDistro.sh Mon Dec 20 08:31:45 2004 @@ -0,0 +1,8 @@ +#!/bin/sh + +# +#Tests an installation of a Beehive distribution +# +. beehiveUser.sh +cd ant +ant -Dwebapp.dir=$BEEHIVE_HOME/samples/petstoreWeb -f buildWebapp.xml deploy.beehive.webapp.runtime build.webapp Modified: incubator/beehive/trunk/user/beehiveUser.sh Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/beehiveUser.sh?view=diff&rev=122859&p1=incubator/beehive/trunk/user/beehiveUser.sh&r1=122858&p2=incubator/beehive/trunk/user/beehiveUser.sh&r2=122859 ============================================================================== --- incubator/beehive/trunk/user/beehiveUser.sh (original) +++ incubator/beehive/trunk/user/beehiveUser.sh Mon Dec 20 08:31:45 2004 @@ -17,4 +17,4 @@ # location of Tomcat export [EMAIL PROTECTED]@ -export PATH=$PATH:$JAVA_HOME/bin:$ANT_HOME/bin +export PATH=$JAVA_HOME/bin:$ANT_HOME/bin:$PATH
