Merge pull request #457 from lstocchi/i452

Run unit tests on linux
containers · Jan 13, 2025 · 56369d1 · 56369d1
2 parents 2959505 + 0f43aa9
commit 56369d1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -57,7 +57,7 @@ jobs:
 
     - name: Test
       run: |
-        sudo -s -u ${USER} bash -c 'make test-linux'
+        sudo -s -u ${USER} bash -c 'make test'
 
     - uses: actions/upload-artifact@v4
       if: always()

diff --git a/Makefile b/Makefile
@@ -67,8 +67,12 @@ cross: $(TOOLS_BINDIR)/makefat
 test-companion:
 	GOOS=linux go build -ldflags "$(LDFLAGS)" -o bin/test-companion ./cmd/test-companion
 
-.PHONY: test-linux
-test-linux: gvproxy test-companion
+PHONY: test
+test: gvproxy test-companion
+	go test -timeout 20m -v ./...
+
+.PHONY: test-qemu
+test-qemu: gvproxy test-companion
 	go test -timeout 20m  -v ./test-qemu
 
 .PHONY: test-mac

diff --git a/test-vfkit/basic_test.go b/test-vfkit/basic_test.go
@@ -1,3 +1,5 @@
+//go:build darwin
+
 package e2evfkit
 
 import (

diff --git a/test-vfkit/vfkit_suite_test.go b/test-vfkit/vfkit_suite_test.go
@@ -1,3 +1,5 @@
+//go:build darwin
+
 package e2evfkit
 
 import (