Fix deterministic builds.

jsha · jsha · commit 0ef3fb02479e · 2015-03-09T17:53:41.000-07:00
Remove DB before changing.
Report version of sqlite3 during testing.
diff --git a/test.sh b/test.sh
@@ -60,4 +60,9 @@ fi
 popd
 
 bash test-ruleset-coverage.sh
+# Echo the version of sqlite3, since the determinism of the build depends on
+# having the same version.
+echo "To reproduce this build (https://wiki.debian.org/ReproducibleBuilds)," \
+     "please use this version of sqlite3:"
+sqlite3 -version
 echo -e "Git commit `git rev-parse HEAD`\nsha256sum  `sha256sum $XPI_NAME`"
diff --git a/utils/make-sqlite.py b/utils/make-sqlite.py
@@ -18,7 +18,11 @@
 # It's also helpful to ensure consistency for the lowercase check below.
 locale.setlocale(locale.LC_ALL, 'C')
 
-conn = sqlite3.connect(os.path.join(os.path.dirname(__file__), '../src/defaults/rulesets.sqlite'))
+# Removing the file before we create it avoids some non-determinism.
+db_path = os.path.join(os.path.dirname(__file__), '../src/defaults/rulesets.sqlite')
+if os.path.isfile(db_path):
+    os.remove(db_path)
+conn = sqlite3.connect(db_path)
 c = conn.cursor()
 c.execute('''DROP TABLE IF EXISTS rulesets''')
 c.execute('''CREATE TABLE rulesets
