Skip to content

test(endtoend): Enable for more build targets #3041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyleconroy merged 11 commits into from
Dec 5, 2023
Merged

test(endtoend): Enable for more build targets #3041

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9679004
See Windows failures
kyleconroy Dec 5, 2023
3e283fd
run the tests without cgo
kyleconroy Dec 5, 2023
1115d0e
Ignore managed mode
kyleconroy Dec 5, 2023
1666b5d
come on
kyleconroy Dec 5, 2023
0de46b7
Let's try again
kyleconroy Dec 5, 2023
5bc92e7
Also update line endings for stderr
kyleconroy Dec 5, 2023
3173419
stderr comparer
kyleconroy Dec 5, 2023
34cc691
let's try this
kyleconroy Dec 5, 2023
9d81df9
Fix last test
kyleconroy Dec 5, 2023
64b18c3
Skip tests if WASM isn't enabled
kyleconroy Dec 5, 2023
5af5046
Skip a few more tests
kyleconroy Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Skip tests if WASM isn't enabled
  • Loading branch information
@kyleconroy
kyleconroy committed Dec 5, 2023
commit 64b18c3d88790ba61e6924c690b13f058acf811f
1 change: 1 addition & 0 deletions internal/endtoend/case_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ type Exec struct {
Contexts []string `json:"contexts"`
Process string `json:"process"`
OS []string `json:"os"`
WASM bool `json:"wasm"`
Env map[string]string `json:"env"`
}

Expand Down
5 changes: 5 additions & 0 deletions internal/endtoend/endtoend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (

"github.com/sqlc-dev/sqlc/internal/cmd"
"github.com/sqlc-dev/sqlc/internal/config"
"github.com/sqlc-dev/sqlc/internal/ext/wasm"
"github.com/sqlc-dev/sqlc/internal/opts"
)

Expand Down Expand Up @@ -169,6 +170,10 @@ func TestReplay(t *testing.T) {
}
}

if args.WASM && !wasm.Enabled() {
t.Skipf("wasm support not enabled")
}

if len(args.OS) > 0 {
if !slices.Contains(args.OS, runtime.GOOS) {
t.Skipf("unsupported os: %s", runtime.GOOS)
Expand Down
3 changes: 3 additions & 0 deletions internal/endtoend/testdata/wasm_plugin_sqlc_gen_greeter/exec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"wasm": true
}
3 changes: 3 additions & 0 deletions internal/endtoend/testdata/wasm_plugin_sqlc_gen_test/exec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"wasm": true
}
4 changes: 4 additions & 0 deletions internal/ext/wasm/nowasm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import (
"google.golang.org/grpc/status"
)

func Enabled() bool {
return false
}

func (r *Runner) Invoke(ctx context.Context, method string, args any, reply any, opts ...grpc.CallOption) error {
return status.Error(codes.FailedPrecondition, "sqlc built without wasmtime support")
}
Expand Down
4 changes: 4 additions & 0 deletions internal/ext/wasm/wasm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ import (
"github.com/sqlc-dev/sqlc/internal/plugin"
)

func Enabled() bool {
return true
}

// This version must be updated whenever the wasmtime-go dependency is updated
const wasmtimeVersion = `v14.0.0`

Expand Down