aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rwxr-xr-xtests/canonical-benchmarks.bash2
-rw-r--r--tests/test_helpers/helpers.go18
2 files changed, 17 insertions, 3 deletions
diff --git a/tests/canonical-benchmarks.bash b/tests/canonical-benchmarks.bash
index 963fd6a..5803896 100755
--- a/tests/canonical-benchmarks.bash
+++ b/tests/canonical-benchmarks.bash
@@ -49,7 +49,7 @@ dd if=zero of=/dev/null bs=131072 count=2000 2>&1 | tail -n 1
rm zero
sleep 0.1
echo -n "UNTAR: "
-etime tar xzf /tmp/linux-3.0.tar.gz
+etime tar xf /tmp/linux-3.0.tar
sleep 0.1
echo -n "MD5: "
etime md5sum --quiet -c "$MD5"
diff --git a/tests/test_helpers/helpers.go b/tests/test_helpers/helpers.go
index fd2ea9c..53187ac 100644
--- a/tests/test_helpers/helpers.go
+++ b/tests/test_helpers/helpers.go
@@ -22,8 +22,16 @@ import (
// $TMPDIR/gocryptfs-test-parent .
var testParentDir = ""
-// GocryptfsBinary is the assumed path to the gocryptfs build.
-const GocryptfsBinary = "../../gocryptfs"
+// GocryptfsBinary is the path to the gocryptfs build under test.
+// test.bash sets $GOCRYPTFS_TEST_BINARY to a coverage-instrumented build.
+var GocryptfsBinary = gocryptfsBinary()
+
+func gocryptfsBinary() string {
+ if b := os.Getenv("GOCRYPTFS_TEST_BINARY"); b != "" {
+ return b
+ }
+ return "../../gocryptfs"
+}
// UnmountScript is the fusermount/umount compatibility wrapper script
const UnmountScript = "../../tests/fuse-unmount.bash"
@@ -42,6 +50,12 @@ var DefaultPlainDir string
var DefaultCipherDir string
func init() {
+ // "go test -cover" overwrites $GOCOVERDIR with a temporary directory, so
+ // let's overwrite it back. Then the gocryptfs processes, that we start,
+ // write coverage info to ./coverage/data like the unit tests do.
+ if d := os.Getenv("GOCRYPTFS_COVERAGE_DATA"); d != "" {
+ os.Setenv("GOCOVERDIR", d)
+ }
doInit()
}