tests: split "normal" tests into "cli" and "defaults"

Also fixes the failure to run the benchmarks do to the missing
gocryptfs.diriv.

1 files changed, 0 insertions, 131 deletions

diff --git a/tests/normal/performance_test.go b/tests/normal/performance_test.go
deleted file mode 100644
index 78ecf41..0000000
--- a/tests/normal/performance_test.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package normal
-
-// Benchmarks
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/rfjakob/gocryptfs/tests/test_helpers"
-)
-
-func BenchmarkStreamWrite(t *testing.B) {
-	buf := make([]byte, 1024*1024)
-	t.SetBytes(int64(len(buf)))
-
-	file, err := os.Create(test_helpers.DefaultPlainDir + "BenchmarkWrite")
-	if err != nil {
-		t.FailNow()
-	}
-
-	t.ResetTimer()
-	var i int
-	for i = 0; i < t.N; i++ {
-		written, err := file.Write(buf)
-		if err != nil {
-			fmt.Printf("err=\"%s\", written=%d\n", err.Error(), written)
-			t.FailNow()
-		}
-	}
-	file.Close()
-}
-
-func BenchmarkStreamRead(t *testing.B) {
-	buf := make([]byte, 1024*1024)
-	t.SetBytes(int64(len(buf)))
-
-	fn := test_helpers.DefaultPlainDir + "BenchmarkWrite"
-	fi, err := os.Stat(fn)
-	if err != nil {
-		t.Fatal(err)
-	}
-	mb := int(fi.Size() / 1024 / 1024)
-
-	if t.N > mb {
-		// Grow file so we can satisfy the test
-		//fmt.Printf("Growing file to %d MB... ", t.N)
-		var f2 *os.File
-		f2, err = os.OpenFile(fn, os.O_WRONLY|os.O_APPEND, 0666)
-		if err != nil {
-			fmt.Println(err)
-			t.FailNow()
-		}
-		for h := 0; h < t.N-mb; h++ {
-			_, err = f2.Write(buf)
-			if err != nil {
-				fmt.Println(err)
-				t.FailNow()
-			}
-		}
-		f2.Close()
-	}
-
-	file, err := os.Open(fn)
-	if err != nil {
-		t.FailNow()
-	}
-	t.ResetTimer()
-	var i int
-	for i = 0; i < t.N; i++ {
-		_, err := file.Read(buf)
-		if err == io.EOF {
-			fmt.Println("Test file too small")
-			t.SkipNow()
-		} else if err != nil {
-			fmt.Println(err)
-			t.FailNow()
-		}
-	}
-	file.Close()
-}
-
-// createFiles - create "count" files of size "size" bytes each
-func createFiles(t *testing.B, count int, size int) {
-	dir := fmt.Sprintf("%s/createFiles_%d_%d", test_helpers.DefaultPlainDir, count, size)
-	err := os.Mkdir(dir, 0777)
-	if err != nil {
-		t.Fatal(err)
-	}
-	buf := make([]byte, size)
-	t.SetBytes(int64(len(buf)))
-	t.ResetTimer()
-	var i int
-	for i = 0; i < count; i++ {
-		file := fmt.Sprintf("%s/%d", dir, i)
-		if size > 0 {
-			err = ioutil.WriteFile(file, buf, 0666)
-		} else {
-			var fh *os.File
-			fh, err = os.Create(file)
-			fh.Close()
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-	t.StopTimer()
-	os.RemoveAll(dir)
-}
-
-func BenchmarkCreate0B(t *testing.B) {
-	createFiles(t, t.N, 0)
-}
-
-func BenchmarkCreate1B(t *testing.B) {
-	createFiles(t, t.N, 1)
-}
-
-func BenchmarkCreate100B(t *testing.B) {
-	createFiles(t, t.N, 100)
-}
-
-func BenchmarkCreate4kB(t *testing.B) {
-	createFiles(t, t.N, 4*1024)
-}
-
-func BenchmarkCreate10kB(t *testing.B) {
-	createFiles(t, t.N, 10*1024)
-}