Remove LFS test files. (#210)

ncruces · Jan 6, 2025 · abfad02 · abfad02
1 parent f7c3fb8
commit abfad02
Show file tree

Hide file tree

Showing 21 changed files with 11 additions and 70 deletions.
diff --git a/.github/actions/lfs/action.yml b/.github/actions/lfs/action.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,9 +29,6 @@ jobs:
     - uses: actions/setup-go@v5
       with: { go-version: stable }
 
-    - name: Git LFS pull
-      uses: ./.github/actions/lfs
-
     - name: Format
       run: gofmt -s -w . && git diff --exit-code
       if: matrix.os != 'windows-latest'
@@ -104,9 +101,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Git LFS pull
-      uses: ./.github/actions/lfs
-
     - name: Build
       env:
         GOOS: ${{ matrix.os.name }}
@@ -142,9 +136,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Git LFS pull
-      uses: ./.github/actions/lfs
-
     - name: Build
       env:
         GOOS: ${{ matrix.os.name }}
@@ -170,9 +161,6 @@ jobs:
     - uses: actions/setup-go@v5
       with: { go-version: stable }
 
-    - name: Git LFS pull
-      uses: ./.github/actions/lfs
-
     - name: Test 386 (32-bit)
       run: GOARCH=386 go test -v -short ./...
 
@@ -197,8 +185,5 @@ jobs:
     - uses: actions/setup-go@v5
       with: { go-version: stable }
 
-    - name: Git LFS pull
-      uses: ./.github/actions/lfs
-
     - name: Test
       run: go test -v ./...
diff --git a/sqlite3/download.sh b/sqlite3/download.sh
@@ -32,14 +32,17 @@ curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/ext/misc/uint.c"
 cd ~-
 
 cd ../vfs/tests/mptest/testdata/
-curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/mptest.c"
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/config01.test"
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/config02.test"
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/crash01.test"
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/crash02.subtest"
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/multiwrite01.test"
 cd ~-
 
-cd ../vfs/tests/speedtest1/testdata/
+cd ../vfs/tests/mptest/wasm/
+curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/mptest/mptest.c"
+cd ~-
+
+cd ../vfs/tests/speedtest1/wasm/
 curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.47.2/test/speedtest1.c"
 cd ~-
diff --git a/vfs/tests/mptest/mptest_test.go b/vfs/tests/mptest/mptest_test.go
@@ -2,7 +2,6 @@ package mptest
 
 import (
 	"bytes"
-	"compress/bzip2"
 	"context"
 	"crypto/rand"
 	"embed"
@@ -29,10 +28,7 @@ import (
 	_ "github.com/ncruces/go-sqlite3/vfs/xts"
 )
 
-//go:embed testdata/mptest.wasm.bz2
-var compressed string
-
-//go:embed testdata/*.*test
+//go:embed testdata/*
 var scripts embed.FS
 
 const qemuCI = runtime.GOARCH != "386" && runtime.GOARCH != "amd64" && runtime.GOARCH != "arm64"
@@ -57,10 +53,7 @@ func TestMain(m *testing.M) {
 		panic(err)
 	}
 
-	if !strings.HasPrefix(compressed, "BZh") {
-		panic("Please use Git LFS to clone this repo: https://git-lfs.com/")
-	}
-	binary, err := io.ReadAll(bzip2.NewReader(strings.NewReader(compressed)))
+	binary, err := os.ReadFile("wasm/mptest.wasm")
 	if err != nil {
 		panic(err)
 	}

diff --git a/vfs/tests/mptest/testdata/.gitattributes b/vfs/tests/mptest/testdata/.gitattributes
@@ -1,2 +1 @@
-mptest.wasm.bz2 filter=lfs diff=lfs merge=lfs -text
-*.*test -crlf
+* -crlf
diff --git a/vfs/tests/mptest/testdata/mptest.wasm.bz2 b/vfs/tests/mptest/testdata/mptest.wasm.bz2
diff --git a/vfs/tests/mptest/testdata/.gitignore → vfs/tests/mptest/wasm/.gitignore b/vfs/tests/mptest/testdata/.gitignore → vfs/tests/mptest/wasm/.gitignore
diff --git a/vfs/tests/mptest/testdata/build.sh → vfs/tests/mptest/wasm/build.sh b/vfs/tests/mptest/testdata/build.sh → vfs/tests/mptest/wasm/build.sh
@@ -30,5 +30,4 @@ WASI_SDK="$ROOT/tools/wasi-sdk/bin"
 	--enable-simd --enable-mutable-globals --enable-multivalue \
 	--enable-bulk-memory --enable-reference-types \
 	--enable-nontrapping-float-to-int --enable-sign-ext
-mv mptest.tmp mptest.wasm
-bzip2 -9f mptest.wasm
+mv mptest.tmp mptest.wasm
diff --git a/vfs/tests/mptest/testdata/exports.txt → vfs/tests/mptest/wasm/exports.txt b/vfs/tests/mptest/testdata/exports.txt → vfs/tests/mptest/wasm/exports.txt
diff --git a/vfs/tests/mptest/wasm/go.mod b/vfs/tests/mptest/wasm/go.mod
diff --git a/vfs/tests/mptest/testdata/main.c → vfs/tests/mptest/wasm/main.c b/vfs/tests/mptest/testdata/main.c → vfs/tests/mptest/wasm/main.c
diff --git a/vfs/tests/mptest/wasm/mptest.wasm b/vfs/tests/mptest/wasm/mptest.wasm
diff --git a/vfs/tests/speedtest1/speedtest1_test.go b/vfs/tests/speedtest1/speedtest1_test.go
@@ -2,7 +2,6 @@ package speedtest1
 
 import (
 	"bytes"
-	"compress/bzip2"
 	"context"
 	"crypto/rand"
 	_ "embed"
@@ -27,9 +26,6 @@ import (
 	_ "github.com/ncruces/go-sqlite3/vfs/xts"
 )
 
-//go:embed testdata/speedtest1.wasm.bz2
-var compressed string
-
 var (
 	rt      wazero.Runtime
 	module  wazero.CompiledModule
@@ -52,10 +48,7 @@ func TestMain(m *testing.M) {
 		panic(err)
 	}
 
-	if !strings.HasPrefix(compressed, "BZh") {
-		panic("Please use Git LFS to clone this repo: https://git-lfs.com/")
-	}
-	binary, err := io.ReadAll(bzip2.NewReader(strings.NewReader(compressed)))
+	binary, err := os.ReadFile("wasm/speedtest1.wasm")
 	if err != nil {
 		panic(err)
 	}

diff --git a/vfs/tests/speedtest1/testdata/.gitattributes b/vfs/tests/speedtest1/testdata/.gitattributes
diff --git a/vfs/tests/speedtest1/testdata/speedtest1.wasm.bz2 b/vfs/tests/speedtest1/testdata/speedtest1.wasm.bz2
diff --git a/vfs/tests/speedtest1/testdata/.gitignore → vfs/tests/speedtest1/wasm/.gitignore b/vfs/tests/speedtest1/testdata/.gitignore → vfs/tests/speedtest1/wasm/.gitignore
diff --git a/vfs/tests/speedtest1/testdata/build.sh → vfs/tests/speedtest1/wasm/build.sh b/vfs/tests/speedtest1/testdata/build.sh → vfs/tests/speedtest1/wasm/build.sh
@@ -25,5 +25,4 @@ WASI_SDK="$ROOT/tools/wasi-sdk/bin"
 	--enable-simd --enable-mutable-globals --enable-multivalue \
 	--enable-bulk-memory --enable-reference-types \
 	--enable-nontrapping-float-to-int --enable-sign-ext
-mv speedtest1.tmp speedtest1.wasm
-bzip2 -9f speedtest1.wasm
+mv speedtest1.tmp speedtest1.wasm
diff --git a/vfs/tests/speedtest1/testdata/exports.txt → vfs/tests/speedtest1/wasm/exports.txt b/vfs/tests/speedtest1/testdata/exports.txt → vfs/tests/speedtest1/wasm/exports.txt
diff --git a/vfs/tests/speedtest1/wasm/go.mod b/vfs/tests/speedtest1/wasm/go.mod
diff --git a/vfs/tests/speedtest1/testdata/main.c → vfs/tests/speedtest1/wasm/main.c b/vfs/tests/speedtest1/testdata/main.c → vfs/tests/speedtest1/wasm/main.c
diff --git a/vfs/tests/speedtest1/wasm/speedtest1.wasm b/vfs/tests/speedtest1/wasm/speedtest1.wasm