Skip to content

Commit fcf28b1

Browse files
committed
Review feedback.
1 parent c0648db commit fcf28b1

File tree

4 files changed

+37
-12
lines changed

4 files changed

+37
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ dist/
4545
spark-*-bin.tar.gz
4646
unit-tests.log
4747
/lib/
48+
rat-results.txt

.rat-excludes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ SparkMemberHandlers.scala
3434
sbt
3535
sbt-launch-lib.bash
3636
plugins.sbt
37+
work
38+
.*\.q
39+
golden

dev/rat.bash renamed to dev/check-license

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
# limitations under the License.
1818
#
1919

20+
2021
acquire_rat_jar () {
2122

2223
URL1="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat/${RAT_VERSION}/apache-rat-${RAT_VERSION}.jar"
@@ -47,3 +48,33 @@ acquire_rat_jar () {
4748
printf "Launching rat from ${JAR}\n"
4849
fi
4950
}
51+
52+
# Go to the Spark project root directory
53+
FWDIR="$(cd `dirname $0`/..; pwd)"
54+
cd $FWDIR
55+
56+
if test -x "$JAVA_HOME/bin/java"; then
57+
declare java_cmd="$JAVA_HOME/bin/java"
58+
else
59+
declare java_cmd=java
60+
fi
61+
62+
export RAT_VERSION=0.10
63+
export rat_jar=$FWDIR/lib/apache-rat-${RAT_VERSION}.jar
64+
mkdir -p $FWDIR/lib
65+
66+
[[ -f "$rat_jar" ]] || acquire_rat_jar || {
67+
echo "Download failed. Obtain the rat jar manually and place it at $rat_jar"
68+
exit 1
69+
}
70+
71+
$java_cmd -jar $rat_jar -E $FWDIR/.rat-excludes -d $FWDIR > rat-results.txt
72+
73+
ERRORS=$(cat rat-results.txt | grep -e "??")
74+
75+
if test ! -z "$ERRORS"; then
76+
echo -e "Found errors: $ERRORS\n"
77+
exit 1
78+
else
79+
echo -e "RAT checks passed."
80+
fi

dev/run-tests

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,13 @@ else
3434
fi
3535

3636
JAVA_VERSION=$($java_cmd -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
37-
[ "$JAVA_VERSION" -ge 18 ] && echo "" || echo "[Warn] Java 8 tests will not run, because JDK version is < 1.8."
38-
39-
export RAT_VERSION=0.10
40-
export rat_jar=$FWDIR/lib/apache-rat-${RAT_VERSION}.jar
41-
mkdir -p $FWDIR/lib
42-
43-
source $FWDIR/dev/rat.bash
37+
[ "$JAVA_VERSION" -ge 18 ] && echo "" || echo "[Warn] Java 8 tests will not run because JDK version is < 1.8."
4438

4539
echo "========================================================================="
4640
echo "Running Apache RAT checks"
4741
echo "========================================================================="
48-
[[ -f "$rat_jar" ]] || acquire_rat_jar || {
49-
echo "Download failed. Obtain the rat jar manually and place it at $rat_jar"
50-
exit 1
51-
}
5242

53-
$java_cmd -jar $rat_jar -E $FWDIR/.rat-excludes -d $FWDIR
43+
dev/check-license
5444

5545
echo "========================================================================="
5646
echo "Running Scala style checks"

0 commit comments

Comments
 (0)