You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/10/29 06:54:15 UTC
svn commit: r1028616 - in /geronimo/tck/branches/3.0: jaxb-tck-runner/run.sh stax-tck-runner/run.sh

Author: genspring
Date: Fri Oct 29 04:54:15 2010
New Revision: 1028616

URL: http://svn.apache.org/viewvc?rev=1028616&view=rev
Log:
Use java from JAVA_HOME instead of the one from PATH.

Modified:
    geronimo/tck/branches/3.0/jaxb-tck-runner/run.sh
    geronimo/tck/branches/3.0/stax-tck-runner/run.sh

Modified: geronimo/tck/branches/3.0/jaxb-tck-runner/run.sh
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/jaxb-tck-runner/run.sh?rev=1028616&r1=1028615&r2=1028616&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/jaxb-tck-runner/run.sh (original)
+++ geronimo/tck/branches/3.0/jaxb-tck-runner/run.sh Fri Oct 29 04:54:15 2010
@@ -30,7 +30,7 @@ startAgent() {
     fi
   done
 
-  java -XX:MaxPermSize=160m -Djava.endorsed.dirs=./target/dependency/endorsed -cp $JAXB_HOME/lib/javatest.jar:$JAXB_HOME/lib/jtlegacy.jar:$JAXB_HOME/classes:$JAXB_CLASSPATH:$JAVA_HOME/lib/tools.jar -Djava.security.policy=$JAXB_HOME/lib/tck.policy com.sun.javatest.agent.AgentMain -activeHost localhost &
+  $JAVA_HOME/bin/java -XX:MaxPermSize=160m -Djava.endorsed.dirs=./target/dependency/endorsed -cp $JAXB_HOME/lib/javatest.jar:$JAXB_HOME/lib/jtlegacy.jar:$JAXB_HOME/classes:$JAXB_CLASSPATH:$JAVA_HOME/lib/tools.jar -Djava.security.policy=$JAXB_HOME/lib/tck.policy com.sun.javatest.agent.AgentMain -activeHost localhost &
   AGENT_PID=$!
  
   sleep 5
@@ -47,7 +47,7 @@ fi
 
   echo "Running Tests. Test directory is: $TEST_DIR"
 
-  java -jar $JAXB_HOME/lib/javatest.jar -config ./target/test-classes/jaxb.jti -workdir -create $TEST_DIR -testSuite $JAXB_HOME -set jck.env.jaxb.testExecute.cmdAsFile $JAVA_HOME/bin/java -startAgentPool -excludeList $JAXB_HOME/lib/jaxb_tck22.jtx -verbose -runtests -writereport $TEST_DIR/report
+  $JAVA_HOME/bin/java -jar $JAXB_HOME/lib/javatest.jar -config ./target/test-classes/jaxb.jti -workdir -create $TEST_DIR -testSuite $JAXB_HOME -set jck.env.jaxb.testExecute.cmdAsFile $JAVA_HOME/bin/java -startAgentPool -excludeList $JAXB_HOME/lib/jaxb_tck22.jtx -verbose -runtests -writereport $TEST_DIR/report
 
 }
 

Modified: geronimo/tck/branches/3.0/stax-tck-runner/run.sh
URL: http://svn.apache.org/viewvc/geronimo/tck/branches/3.0/stax-tck-runner/run.sh?rev=1028616&r1=1028615&r2=1028616&view=diff
==============================================================================
--- geronimo/tck/branches/3.0/stax-tck-runner/run.sh (original)
+++ geronimo/tck/branches/3.0/stax-tck-runner/run.sh Fri Oct 29 04:54:15 2010
@@ -42,5 +42,5 @@ echo "Running Tests. Test directory is: 
 mkdir $TEST_DIR
 
 cd $STAX_HOME
-java -jar $STAX_HOME/lib/javatest.jar -batch "testsuite $STAX_HOME; workdir $TEST_DIR; open $BASE_DIR/target/test-classes/stax.jti; set StAX\ TCK.jvm $JAVA_HOME/bin/java; set StAX\ TCK.tckClasspath \"$STAX_CLASSPATH\"; runtests"
+  $JAVA_HOME/bin/java -jar $STAX_HOME/lib/javatest.jar -batch "testsuite $STAX_HOME; workdir $TEST_DIR; open $BASE_DIR/target/test-classes/stax.jti; set StAX\ TCK.jvm $JAVA_HOME/bin/java; set StAX\ TCK.tckClasspath \"$STAX_CLASSPATH\"; runtests"