From 2620cad0dc003c4d06b3c1c082a3337b64bc9410 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Wed, 8 Sep 2021 20:34:01 +0200 Subject: tests/matrix: test xchacha with and without openssl --- tests/matrix/matrix_test.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/matrix/matrix_test.go b/tests/matrix/matrix_test.go index abcb7e0..34c111f 100644 --- a/tests/matrix/matrix_test.go +++ b/tests/matrix/matrix_test.go @@ -20,6 +20,7 @@ import ( "sync" "syscall" "testing" + "time" "golang.org/x/sys/unix" @@ -66,7 +67,9 @@ var matrix = []testcaseMatrix{ {false, "auto", false, false, []string{"-serialize_reads"}}, {false, "auto", false, false, []string{"-sharedstorage"}}, {false, "auto", false, false, []string{"-deterministic-names"}}, - {false, "auto", false, true, []string{"-xchacha"}}, + // Test xchacha with and without openssl + {false, "true", false, true, []string{"-xchacha"}}, + {false, "false", false, true, []string{"-xchacha"}}, } // This is the entry point for the tests @@ -97,7 +100,11 @@ func TestMain(m *testing.M) { opts = append(opts, testcase.extraArgs...) test_helpers.MountOrExit(test_helpers.DefaultCipherDir, test_helpers.DefaultPlainDir, opts...) before := test_helpers.ListFds(0, test_helpers.TmpDir) + t0 := time.Now() r := m.Run() + if testing.Verbose() { + fmt.Printf("matrix: run took %v\n", time.Since(t0)) + } // Catch fd leaks in the tests. NOTE: this does NOT catch leaks in // the gocryptfs FUSE process, but only in the tests that access it! // All fds that point outside TmpDir are not interesting (the Go test -- cgit v1.2.3