19
19
20
20
set -x
21
21
22
- # ## Setup some variables.
22
+ # ## Setup some variables.
23
23
# ## GIT_COMMIT and BUILD_URL are set by Hudson if it is run by patch process
24
24
# ## Read variables from properties file
25
25
bindir=$( dirname $0 )
@@ -160,7 +160,7 @@ parseArgs() {
160
160
# ## Check if $PATCH_DIR exists. If it does not exist, create a new directory
161
161
if [[ ! -e " $PATCH_DIR " ]] ; then
162
162
mkdir " $PATCH_DIR "
163
- if [[ $? == 0 ]] ; then
163
+ if [[ $? == 0 ]] ; then
164
164
echo " $PATCH_DIR has been created"
165
165
else
166
166
echo " Unable to create $PATCH_DIR "
@@ -296,7 +296,7 @@ setup () {
296
296
VERSION=${GIT_COMMIT} _${defect} _PATCH-${patchNum}
297
297
findBranchNameFromPatchName ${relativePatchURL}
298
298
checkoutBranch
299
- JIRA_COMMENT=" Here are the results of testing the latest attachment
299
+ JIRA_COMMENT=" Here are the results of testing the latest attachment
300
300
$patchURL
301
301
against ${BRANCH_NAME} branch at commit ${GIT_COMMIT} .
302
302
ATTACHMENT ID: ${ATTACHMENT_ID} "
@@ -485,7 +485,7 @@ applyPatch () {
485
485
echo " ======================================================================"
486
486
echo " "
487
487
echo " "
488
-
488
+
489
489
export PATCH
490
490
$BASEDIR /dev/smart-apply-patch.sh $PATCH_DIR /patch
491
491
if [[ $? != 0 ]] ; then
@@ -786,7 +786,7 @@ checkFindbugsWarnings () {
786
786
echo " ======================================================================"
787
787
echo " "
788
788
echo " "
789
- echo " $MVN clean package findbugs:findbugs -D${PROJECT_NAME} PatchProcess"
789
+ echo " $MVN clean package findbugs:findbugs -D${PROJECT_NAME} PatchProcess"
790
790
export MAVEN_OPTS=" ${MAVEN_OPTS} "
791
791
$MVN clean package findbugs:findbugs -D${PROJECT_NAME} PatchProcess -DskipTests < /dev/null
792
792
@@ -797,7 +797,7 @@ checkFindbugsWarnings () {
797
797
return 1
798
798
fi
799
799
800
- collectFindbugsReports patch $BASEDIR $PATCH_DIR
800
+ collectFindbugsReports patch $BASEDIR $PATCH_DIR
801
801
# this files are generated by collectFindbugsReports() named with its first argument
802
802
patch_xml=$PATCH_DIR /patchFindbugsWarnings.xml
803
803
trunk_xml=$PATCH_DIR /trunkFindbugsWarnings.xml
@@ -884,7 +884,7 @@ runTests () {
884
884
if [[ $? != 0 ]] ; then
885
885
# ## Find and format names of failed tests
886
886
failed_tests=` find . -name ' TEST*.xml' | xargs $GREP -l -E " <failure|<error" | sed -e " s|.*target/surefire-reports/TEST-| |g" | sed -e " s|\.xml||g" `
887
-
887
+
888
888
JIRA_COMMENT=" $JIRA_COMMENT
889
889
890
890
{color:red}-1 core tests{color}. The patch failed these unit tests:
@@ -962,7 +962,7 @@ checkInjectSystemFaults () {
962
962
echo " ======================================================================"
963
963
echo " "
964
964
echo " "
965
-
965
+
966
966
# ## Kill any rogue build processes from the last attempt
967
967
$PS auxwww | $GREP ${PROJECT_NAME} PatchProcess | $AWK ' {print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
968
968
@@ -1004,7 +1004,7 @@ $JIRA_COMMENT_FOOTER"
1004
1004
1005
1005
1006
1006
1007
- $comment "
1007
+ $comment "
1008
1008
1009
1009
if [[ $JENKINS == " true" ]] ; then
1010
1010
echo " "
@@ -1099,7 +1099,7 @@ checkLineLengths
1099
1099
(( RESULT = RESULT + $? ))
1100
1100
# checkSiteXml
1101
1101
# (( RESULT = RESULT + $?))
1102
- # ## Do not call these when run by a developer
1102
+ # ## Do not call these when run by a developer
1103
1103
if [[ $JENKINS == " true" ]] ; then
1104
1104
runTests
1105
1105
(( RESULT = RESULT + $? ))
0 commit comments