Moving https-everywhere-checker to test/rules

TheNavigat · TheNavigat · commit 39c3297f9d25 · 2015-09-14T03:19:28.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -2,7 +2,7 @@
 	path = addon-sdk
 	url = https://github.com/mozilla/addon-sdk.git
 [submodule "https-everywhere-checker"]
-	path = https-everywhere-checker
+	path = test/rules
 	url = https://github.com/jsha/https-everywhere-checker.git
 	branch = coverage
 [submodule "translations"]
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,7 @@ addons:
 virtualenv:
   system_site_packages: true
 install:
-  - pip install -r https-everywhere-checker/requirements.txt
+  - pip install -r test/rules/requirements.txt
   - pip install -r test/chromium/requirements.txt
 env:
   - DISPLAY=':99.0'
diff --git a/install-dev-dependencies.sh b/install-dev-dependencies.sh
@@ -31,7 +31,7 @@ git submodule update
 
 # Install Python packages
 pip install --user --no-allow-insecure --no-allow-external -r requirements.txt
-cd https-everywhere-checker
+cd test/rules
 pip install --user -r requirements.txt
 cd -
 cd test/chromium
diff --git a/test/rules b/test/rules
diff --git a/test/rules.sh b/test/rules.sh
@@ -18,17 +18,17 @@ source utils/mktemp.sh
 
 TMP="$(mktemp)"
 trap 'rm "$TMP"' EXIT
-if ! [ -d https-everywhere-checker ] ; then
+if ! [ -d test/rules ] ; then
   echo "Submodule https-everywhere-checker is missing. Run"
   echo "./install-dev-dependencies.sh"
   exit 1
 fi
 if [ $# -gt 0 ] ; then
-  exec python2.7 https-everywhere-checker/src/https_everywhere_checker/check_rules.py \
-    https-everywhere-checker/coverage.checker.config "$@"
+  exec python2.7 test/rules/src/https_everywhere_checker/check_rules.py \
+    test/rules/coverage.checker.config "$@"
 fi
-if ! python2.7 https-everywhere-checker/src/https_everywhere_checker/check_rules.py \
-      https-everywhere-checker/coverage.checker.config; then
+if ! python2.7 test/rules/src/https_everywhere_checker/check_rules.py \
+      test/rules/coverage.checker.config; then
   echo "Ruleset test coverage was insufficient."
   echo ""
   echo "Under the new ruleset testing rules (February 2015), any modified ruleset"
