[TRAVIS] Verify RAT report in a Travis job

felipe29 · Nov 1, 2019 · 81446e6 · 81446e6
1 parent 8befc84
commit 81446e6
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,6 @@ install:
   - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
   - sleep 3
 script:
-  - if [ "x$RAT" == "xtrue" ]; then (ant -quiet build-source-config && mkdir scratch && cd scratch && unzip -qq ../nbbuild/build/release-src* && ant -quiet rat -Drat-report.haltonfailure=true && cd .. && rm -rf scratch); fi
   - if [ "x$OPTS" == "x" ]; then OPTS="-quiet -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false"; fi
   - if [ "x$TARGET" == "x" ]; then TARGET="build"; fi
   - ant $OPTS clean
@@ -42,13 +41,19 @@ script:
 
 matrix:
     include:
-        - name: Check line endings
-          script: nbbuild/travis/check-line-endings.sh
+        - name: Check line endings and verify RAT report
+          script: 
+            - nbbuild/travis/check-line-endings.sh
+            - ant -quiet build-source-config
+            - mkdir scratch
+            - cd scratch
+            - unzip -qq ../nbbuild/build/release-src*
+            - ant -quiet rat -Drat-report.haltonfailure=true
 
-        - env: SIGTEST=false COMPILETEST=true RAT=true LICENSE=true CV=false RUN_TESTS_JDK8=false RUN_JAVA_TESTS=false
+        - env: SIGTEST=false COMPILETEST=true LICENSE=true CV=false RUN_TESTS_JDK8=false RUN_JAVA_TESTS=false
           jdk: openjdk8
 
-        - env: SIGTEST=true COMPILETEST=false RAT=false LICENSE=false CV=true RUN_TESTS_JDK8=false RUN_JAVA_TESTS=false
+        - env: SIGTEST=true COMPILETEST=false LICENSE=false CV=true RUN_TESTS_JDK8=false RUN_JAVA_TESTS=false
           jdk: openjdk8
 
 #        - env: TARGET="build-platform" SCRIPT=nbbuild/travis/scripting.sh
@@ -66,19 +71,18 @@ matrix:
         - env: OPTS="-Dcluster.config=standard -quiet -Dpermit.jdk9.builds=true -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false" TARGET="build"
           jdk: openjdk11
 
-        - env: SIGTEST=false COMPILETEST=false RAT=false LICENSE=false CV=false RUN_TESTS_JDK9PLUS=false RUN_TESTS_JDK8=true TEST_MODULES="java/java.completion java/spi.java.hints java/java.hints.declarative" OPTS="-Dcluster.config=java -quiet build -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest-unit-sys-prop.ignore.random.failures=true"
+        - env: SIGTEST=false COMPILETEST=false LICENSE=false CV=false RUN_TESTS_JDK9PLUS=false RUN_TESTS_JDK8=true TEST_MODULES="java/java.completion java/spi.java.hints java/java.hints.declarative" OPTS="-Dcluster.config=java -quiet build -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest-unit-sys-prop.ignore.random.failures=true"
           jdk: openjdk8
 
-        - env: SIGTEST=false COMPILETEST=false RAT=false LICENSE=false CV=false RUN_TESTS_JDK8=false RUN_TESTS_JDK9PLUS=true TEST_JDK_VERSION="--feature 11 --license GPL" TEST_RUN_OPTIONS='-Dtest.run.args=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument -Dtest.use.jdk.javac=true' TEST_MODULES="java/java.completion" OPTS="-Dcluster.config=java -quiet build -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false"
+        - env: SIGTEST=false COMPILETEST=false LICENSE=false CV=false RUN_TESTS_JDK8=false RUN_TESTS_JDK9PLUS=true TEST_JDK_VERSION="--feature 11 --license GPL" TEST_RUN_OPTIONS='-Dtest.run.args=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument -Dtest.use.jdk.javac=true' TEST_MODULES="java/java.completion" OPTS="-Dcluster.config=java -quiet build -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false"
           jdk: openjdk8
 
-        - env: SIGTEST=false COMPILETEST=false RAT=false LICENSE=false CV=false RUN_TESTS_JDK8=false RUN_TESTS_JDK9PLUS=true TEST_JDK_VERSION="--feature 12 --license GPL" TEST_RUN_OPTIONS='-Dtest.run.args=--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED -Dtest.use.jdk.javac=true' TEST_MODULES="java/java.completion" OPTS="-Dcluster.config=java -quiet build -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false"
+        - env: SIGTEST=false COMPILETEST=false LICENSE=false CV=false RUN_TESTS_JDK8=false RUN_TESTS_JDK9PLUS=true TEST_JDK_VERSION="--feature 12 --license GPL" TEST_RUN_OPTIONS='-Dtest.run.args=--add-exports=jdk.javadoc/com.sun.tools.javadoc.main=ALL-UNNAMED -Dtest.use.jdk.javac=true' TEST_MODULES="java/java.completion" OPTS="-Dcluster.config=java -quiet build -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false"
           jdk: openjdk8
 
         - env: > 
             SIGTEST=false 
             COMPILETEST=false 
-            RAT=false 
             LICENSE=false 
             CV=false 
             RUN_TESTS_JDK9PLUS=false