File tree Expand file tree Collapse file tree 2 files changed +11
-23
lines changed Expand file tree Collapse file tree 2 files changed +11
-23
lines changed Original file line number Diff line number Diff line change @@ -158,11 +158,7 @@ for t in "${PR_TESTS[@]}"; do
158
158
# Ensure the test can be found and is a file
159
159
if [ -f " ${this_test} " ]; then
160
160
echo " Running test: $t "
161
- this_mssg=" $( bash -x " ${this_test} " " ${ghprbActualCommit} " " ${sha1} " ) "
162
- # Check the return value from the test to ensure it exited properly
163
- # [ $? > 0 ] && \
164
- # echo "Error while running test: $t" && \
165
- # continue
161
+ this_mssg=" $( bash " ${this_test} " " ${ghprbActualCommit} " " ${sha1} " ) "
166
162
# Check if this is the merge test as we submit that note *before* and *after*
167
163
# the tests run
168
164
[ " $t " == " pr_merge_ability" ] && merge_note=" ${this_mssg} "
Original file line number Diff line number Diff line change 31
31
ghprbActualCommit=" $1 "
32
32
sha1=" $2 "
33
33
34
- set -e
35
-
36
34
MVN_BIN=" ` pwd` /build/mvn"
37
35
CURR_CP_FILE=" my-classpath.txt"
38
36
MASTER_CP_FILE=" master-classpath.txt"
39
37
40
- ${MVN_BIN} clean package dependency:build-classpath -DskipTests 2> /dev/null
41
-
42
- # ${MVN_BIN} clean package dependency:build-classpath 2>/dev/null | \
43
- # sed -n -e '/Building Spark Project Assembly/,$p' | \
44
- # grep --context=1 -m 2 "Dependencies classpath:" | \
45
- # head -n 3 | \
46
- # tail -n 1 | \
47
- # tr ":" "\n" | \
48
- # rev | \
49
- # cut -d "/" -f 1 | \
50
- # rev | \
51
- # sort > ${CURR_CP_FILE}
38
+ ${MVN_BIN} clean package dependency:build-classpath -DskipTests 2> /dev/null | \
39
+ sed -n -e ' /Building Spark Project Assembly/,$p' | \
40
+ grep --context=1 -m 2 " Dependencies classpath:" | \
41
+ head -n 3 | \
42
+ tail -n 1 | \
43
+ tr " :" " \n" | \
44
+ rev | \
45
+ cut -d " /" -f 1 | \
46
+ rev | \
47
+ sort > ${CURR_CP_FILE}
52
48
53
49
# Checkout the master branch to compare against
54
50
git checkout master & > /dev/null
93
89
94
90
# Clean up our mess from the Maven builds just in case
95
91
${MVN_BIN} clean & > /dev/null
96
-
97
- set +e
98
-
99
- exit 0
You can’t perform that action at this time.
0 commit comments