diff options
author | Jakob Unterwurzacher | 2017-03-05 17:44:14 +0100 |
---|---|---|
committer | Jakob Unterwurzacher | 2017-03-05 17:44:14 +0100 |
commit | 966308eeb7793a4a8ca578e160981e3b059b82e6 (patch) | |
tree | 36b0b6d192b26b7c3addcd74bbc566a40736773c /tests | |
parent | e6461634422e7713d1863b416934297a8f6c4244 (diff) |
Drop Go 1.4 compatability code everywhere
Yields a nice reduction in code size.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/example_filesystems/example_filesystems_test.go | 8 | ||||
-rw-r--r-- | tests/matrix/matrix_test.go | 10 |
2 files changed, 1 insertions, 17 deletions
diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go index 5192278..a43d2a9 100644 --- a/tests/example_filesystems/example_filesystems_test.go +++ b/tests/example_filesystems/example_filesystems_test.go @@ -12,7 +12,6 @@ import ( "os" "testing" - "github.com/rfjakob/gocryptfs/internal/cryptocore" "github.com/rfjakob/gocryptfs/internal/stupidgcm" "github.com/rfjakob/gocryptfs/tests/test_helpers" ) @@ -24,12 +23,7 @@ var opensslOpt string func TestMain(m *testing.M) { // Make "testing.Verbose()" return the correct value flag.Parse() - var variants []string - if cryptocore.HaveModernGoGCM { - variants = append(variants, "-openssl=false") - } else { - fmt.Println("Skipping Go GCM tests, Go installation is too old") - } + variants := []string{"-openssl=false"} if !stupidgcm.BuiltWithoutOpenssl { variants = append(variants, "-openssl=true") } else { diff --git a/tests/matrix/matrix_test.go b/tests/matrix/matrix_test.go index 1c5d348..88c255e 100644 --- a/tests/matrix/matrix_test.go +++ b/tests/matrix/matrix_test.go @@ -23,8 +23,6 @@ import ( "syscall" "testing" - "github.com/rfjakob/gocryptfs/internal/cryptocore" - "github.com/rfjakob/gocryptfs/internal/nametransform" "github.com/rfjakob/gocryptfs/internal/syscallcompat" "github.com/rfjakob/gocryptfs/tests/test_helpers" ) @@ -60,14 +58,6 @@ func TestMain(m *testing.M) { // Make "testing.Verbose()" return the correct value flag.Parse() for _, testcase = range matrix { - if !cryptocore.HaveModernGoGCM && testcase.openssl != "true" { - fmt.Printf("Skipping Go GCM variant, Go installation is too old") - continue - } - if testcase.raw64 && !nametransform.HaveRaw64 { - fmt.Printf("Skipping raw64 test, Go installation is too old") - continue - } if testing.Verbose() { fmt.Printf("matrix: testcase = %#v\n", testcase) } |