Index: dev-support/test-patch.sh =================================================================== --- dev-support/test-patch.sh (revision 1393782) +++ dev-support/test-patch.sh (working copy) @@ -589,12 +589,16 @@ echo "" echo "======================================================================" echo "======================================================================" - echo " Running tests." + echo " Running tests against JDK $1." echo "======================================================================" echo "======================================================================" echo "" echo "" + JAVA__HOME=$JAVA_HOME + if [[ $1 == "1.7" ]]; then + JAVA_HOME=/home/hudson/tools/java/latest1.7 + fi failed_tests="" ### Kill any rogue build processes from the last attempt $PS auxwww | $GREP ${PROJECT_NAME}PatchProcess | $AWK '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null @@ -614,9 +618,10 @@ else JIRA_COMMENT="$JIRA_COMMENT - {color:green}+1 core tests{color}. The patch passed unit tests in $modules." + {color:green}+1 core tests{color}. The patch passed unit tests in $modules against JDK $1." return 0 fi + JAVA_HOME=$JAVA__HOME } ############################################################################### @@ -759,10 +764,15 @@ (( RESULT = RESULT + $? )) ### Do not call these when run by a developer if [[ $JENKINS == "true" ]] ; then - runTests + runTests "1.6" (( RESULT = RESULT + $? )) JIRA_COMMENT_FOOTER="Test results: $BUILD_URL/testReport/ $JIRA_COMMENT_FOOTER" + + runTests "1.7" + (( RESULT = RESULT + $? )) +JIRA_COMMENT_FOOTER="Test results: $BUILD_URL/testReport/ +$JIRA_COMMENT_FOOTER" fi submitJiraComment $RESULT cleanupAndExit $RESULT