diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 3a26695..7a4fb9a 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,3 +1,4 @@ +--- name: Go on: push: @@ -9,8 +10,8 @@ jobs: name: Build and Test strategy: matrix: - go-version: [1.12.x, 1.13.x, 1.14.x] - platform: [ubuntu-latest, macos-latest, windows-latest] + go-version: [1.12.x, 1.13.x, 1.14.l, 1.15.xx] + platform: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.platform }} steps: - name: Setup Go ${{ matrix.go-version }} diff --git a/.gitignore b/.gitignore index 26e789a..d05bfde 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,6 @@ /bitcask /bitcaskd +/bitcask_bench* /cmd/bitcask/bitcask /cmd/bitcaskd/bitcaskd diff --git a/bitcask_test.go b/bitcask_test.go index 4b419f1..08890aa 100644 --- a/bitcask_test.go +++ b/bitcask_test.go @@ -9,7 +9,6 @@ import ( "path" "path/filepath" "reflect" - "runtime" "sort" "strings" "sync" @@ -53,12 +52,6 @@ func SortByteArrays(src [][]byte) [][]byte { return sorted } -func skipIfWindows(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("Skipping this test on Windows") - } -} - func TestAll(t *testing.T) { var ( db *Bitcask @@ -403,9 +396,6 @@ func TestConfigErrors(t *testing.T) { } func TestAutoRecovery(t *testing.T) { - if runtime.GOOS == "windows" { - t.SkipNow() - } withAutoRecovery := []bool{false, true} for _, autoRecovery := range withAutoRecovery { @@ -773,8 +763,6 @@ func TestStatsError(t *testing.T) { }) t.Run("Test", func(t *testing.T) { - skipIfWindows(t) - t.Run("FabricatedDestruction", func(t *testing.T) { // This would never happen in reality :D // Or would it? :) @@ -790,8 +778,6 @@ func TestStatsError(t *testing.T) { } func TestDirFileModeBeforeUmask(t *testing.T) { - skipIfWindows(t) - assert := assert.New(t) t.Run("Setup", func(t *testing.T) { @@ -874,8 +860,6 @@ func TestDirFileModeBeforeUmask(t *testing.T) { } func TestFileFileModeBeforeUmask(t *testing.T) { - skipIfWindows(t) - assert := assert.New(t) t.Run("Setup", func(t *testing.T) { @@ -1345,8 +1329,6 @@ func TestMergeErrors(t *testing.T) { assert := assert.New(t) t.Run("RemoveDatabaseDirectory", func(t *testing.T) { - skipIfWindows(t) - testdir, err := ioutil.TempDir("", "bitcask") assert.NoError(err) defer os.RemoveAll(testdir)