For PRs that only change rulesets, perform only fetch and rule format checking (resolves EFForg#5844)

Hainish · Hainish · commit f6fa38dedb3d · 2016-08-10T17:33:00.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ services:
 before_install:
   - docker build -t httpse .
 script:
-  - docker run --rm -ti -v $(pwd):/opt -e FIREFOX=/$FIREFOX/firefox/firefox --privileged httpse bash -c "./test.sh"
   - docker run --rm -ti -v $(pwd):/opt -e FIREFOX=/$FIREFOX/firefox/firefox --privileged httpse bash -c "service miredo start && test/travis-ruleset-fetch.sh"
 env:
   - FIREFOX=firefox-latest
diff --git a/test/travis-ruleset-fetch.sh b/test/travis-ruleset-fetch.sh
@@ -22,11 +22,25 @@ git remote add upstream-for-travis https://github.com/EFForg/https-everywhere.gi
 git fetch upstream-for-travis master 
 COMMON_BASE_COMMIT=$(git merge-base upstream-for-travis/master HEAD)
 RULESETS_CHANGED=$(git diff --name-only $COMMON_BASE_COMMIT | grep $RULESETFOLDER | grep '.xml')
+if [ "$(git diff --name-only $COMMON_BASE_COMMIT)" != "$RULESETS_CHANGED" ]; then
+  ONLY_RULESETS_CHANGED=false
+fi
 git remote remove upstream-for-travis
 
+if ! $ONLY_RULESETS_CHANGED; then
+  echo >&2 "Core code changes have been made."
+  echo >&2 "Running main test suite."
+  ./test/firefox.sh
+  ./test/chromium.sh
+fi
 # Only run test if something has changed.
 if [ "$RULESETS_CHANGED" ]; then
-  echo >&2 "Ruleset database has changed. Testing test URLs in all changed rulesets."
+  echo >&2 "Ruleset database has changed."
+
+  echo >&2 "Performing comprehensive coverage test."
+  ./test/rules.sh
+
+  echo >&2 "Testing test URLs in all changed rulesets."
 
   # Make a list of all changed rulesets, but exclude those
   # that do not exist.
