Improve validation.

jsha · jsha · commit a0930a0220d6 · 2015-02-15T11:16:34.000-08:00
Remove old cases for different paths to trivial-validate.py.
Pass --quiet option to trivial-validate so it doesn't spam error output with
warnings about duplicate hostnames.
diff --git a/makexpi.sh b/makexpi.sh
@@ -74,18 +74,7 @@ die() {
 }
 
 if [ "$1" != "--fast" -a -z "$FAST" ] ; then
-  if [ -f utils/trivial-validate.py ]; then
-    VALIDATE="python2.7 ./utils/trivial-validate.py --ignoredups google --ignoredups facebook"
-  elif [ -f trivial-validate.py ] ; then
-    VALIDATE="python2.7 trivial-validate.py --ignoredups google --ignoredups facebook"
-  elif [ -x utils/trivial-validate ] ; then
-    # This case probably never happens
-    VALIDATE=./utils/trivial-validate
-  else
-    VALIDATE=./trivial-validate
-  fi
-
-  if $VALIDATE src/chrome/content/rules >&2
+  if python2.7 ./utils/trivial-validate.py --quiet --db $RULESETS_SQLITE >&2
   then
     echo Validation of included rulesets completed. >&2
     echo >&2
diff --git a/utils/trivial-validate.py b/utils/trivial-validate.py
@@ -11,21 +11,16 @@
 parser = argparse.ArgumentParser(
     formatter_class=argparse.RawDescriptionHelpFormatter,
     description="Ruleset validation script.")
-parser.add_argument('--ignoredups', type=str, nargs="*",
-    default="",
-    help="Ignore entries."
-    )
 parser.add_argument('--quiet', action="store_true",
     default=False, help="Suppress debug output."
     )
-parser.add_argument('--db', type=str, nargs="*",
+parser.add_argument('--db',
     default=os.path.join(os.path.dirname(__file__),
                          "../src/defaults/rulesets.sqlite"),
     help='SQLite db with rules')
 
 args = parser.parse_args()
 
-ignoredups = [re.compile(val) for val in args.ignoredups]
 quiet = args.quiet
 
 def warn(s):
