aboutsummaryrefslogtreecommitdiff
path: root/integration_tests/helpers.go
diff options
context:
space:
mode:
authorJakob Unterwurzacher2015-11-15 13:38:19 +0100
committerJakob Unterwurzacher2015-11-15 13:42:04 +0100
commitd95fc2333aa5c05de713694c0893c7690655a584 (patch)
tree676402f6a85ab21839c7757dfbf9493ca921770d /integration_tests/helpers.go
parent066c2c90eb0a156efe9d1a407b32350673a09fed (diff)
Add "-extpass" cli option and associated tests
Diffstat (limited to 'integration_tests/helpers.go')
-rw-r--r--integration_tests/helpers.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/integration_tests/helpers.go b/integration_tests/helpers.go
index fdad28b..3ab1d21 100644
--- a/integration_tests/helpers.go
+++ b/integration_tests/helpers.go
@@ -10,13 +10,13 @@ import (
"testing"
)
+// Note: the code assumes that all have a trailing slash
const tmpDir = "/tmp/gocryptfs_main_test/"
-
-// Mountpoint
-// Note: the code assumes that both have a trailing slash!
const plainDir = tmpDir + "plain/"
const cipherDir = tmpDir + "cipher/"
+const gocryptfsBinary = "../gocryptfs"
+
func resetTmpDir() {
fu := exec.Command("fusermount", "-z", "-u", plainDir)
fu.Run()
@@ -40,11 +40,11 @@ func mount(extraArgs ...string) {
//args = append(args, "--fusedebug")
args = append(args, cipherDir)
args = append(args, plainDir)
- c := exec.Command("../gocryptfs", args...)
- // Warning messages clutter the test output. Uncomment if you want to debug
- // failures.
- //c.Stdout = os.Stdout
- //c.Stderr = os.Stderr
+ c := exec.Command(gocryptfsBinary, args...)
+ if testing.Verbose() {
+ c.Stdout = os.Stdout
+ c.Stderr = os.Stderr
+ }
err := c.Run()
if err != nil {
fmt.Println(err)