Moving test-ruleset-coverage.sh to test/rules.sh and switching running it from firefox.sh to test.sh

TheNavigat · TheNavigat · commit b8baef050790 · 2015-08-31T23:11:56.000+02:00
diff --git a/test.sh b/test.sh
@@ -8,5 +8,6 @@
 
 cd $(dirname $0)/$(dirname $(readlink $0))
 
+./test/rules.sh
 ./test/firefox.sh $@
-./test/chromium.sh $@
+./test/chromium.sh $@
diff --git a/test/firefox.sh b/test/firefox.sh
@@ -65,7 +65,6 @@ 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)," \
diff --git a/test/rules.sh b/test/rules.sh
@@ -4,7 +4,7 @@
 # coverage, according to the ruleset checker.
 #
 
-cd $(dirname $0)
+cd $(dirname $0)/$(dirname $(readlink $0))../
 
 source utils/mktemp.sh
 
diff --git a/utils/mktemp.sh b/utils/mktemp.sh

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# coverage, according to the ruleset checker.`
`5`	`5`	`#`
`6`	`6`
`7`		`-cd $(dirname $0)`
	`7`	`+cd $(dirname $0)/$(dirname $(readlink $0))../`
`8`	`8`
`9`	`9`	`source utils/mktemp.sh`
`10`	`10`