Skip to content

Commit

Permalink
Fix build_test on amd64 NetBSD
Browse files Browse the repository at this point in the history
  • Loading branch information
@darkgeek
darkgeek committed Sep 29, 2023
1 parent 7ffb24d commit 826037f
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 50 deletions.
96 changes: 48 additions & 48 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,72 +13,72 @@ check: ## Check
BUILD_FAIL_PATTERN=grep -v "exec format error" | grep "build failed" && exit 1 || exit 0
build_test: ## test only buildable
# Supported operating systems
GOOS=linux GOARCH=amd64 go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=386 go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=arm go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=arm64 go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=loong64 go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=riscv64 go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=s390x go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=freebsd GOARCH=amd64 go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=freebsd GOARCH=386 go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=freebsd GOARCH=arm go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=freebsd GOARCH=arm64 go test ./... | $(BUILD_FAIL_PATTERN)
CGO_ENABLED=0 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=windows go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=amd64 go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=386 go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=arm go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=arm64 go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=loong64 go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=riscv64 go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=linux GOARCH=s390x go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=freebsd GOARCH=amd64 go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=freebsd GOARCH=386 go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=freebsd GOARCH=arm go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=freebsd GOARCH=arm64 go120 test ./... | $(BUILD_FAIL_PATTERN)
CGO_ENABLED=0 GOOS=darwin go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=windows go120 test ./... | $(BUILD_FAIL_PATTERN)
# Operating systems supported for building only (not implemented error if used)
GOOS=solaris go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=dragonfly go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=netbsd go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=solaris go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=dragonfly go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=netbsd go120 test ./... | $(BUILD_FAIL_PATTERN)
# cross build to OpenBSD not worked since process has "C"
# GOOS=openbsd go test ./... | $(BUILD_FAIL_PATTERN)
GOOS=plan9 go test ./... | $(BUILD_FAIL_PATTERN)
# GOOS=openbsd go120 test ./... | $(BUILD_FAIL_PATTERN)
GOOS=plan9 go120 test ./... | $(BUILD_FAIL_PATTERN)

ifeq ($(shell uname -s), Darwin)
CGO_ENABLED=1 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
CGO_ENABLED=1 GOOS=darwin go120 test ./... | $(BUILD_FAIL_PATTERN)
endif
@echo 'Successfully built on all known operating systems'

vet:
GOOS=darwin GOARCH=amd64 go vet ./...
GOOS=darwin GOARCH=arm64 go vet ./...
GOOS=darwin GOARCH=amd64 go120 vet ./...
GOOS=darwin GOARCH=arm64 go120 vet ./...

GOOS=dragonfly GOARCH=amd64 go vet ./...
GOOS=dragonfly GOARCH=amd64 go120 vet ./...

GOOS=freebsd GOARCH=amd64 go vet ./...
GOOS=freebsd GOARCH=386 go vet ./...
GOOS=freebsd GOARCH=arm go vet ./...
GOOS=freebsd GOARCH=amd64 go120 vet ./...
GOOS=freebsd GOARCH=386 go120 vet ./...
GOOS=freebsd GOARCH=arm go120 vet ./...

GOOS=linux GOARCH=386 go vet ./...
GOOS=linux GOARCH=amd64 go vet ./...
GOOS=linux GOARCH=arm64 go vet ./...
GOOS=linux GOARCH=arm go vet ./...
GOOS=linux GOARCH=loong64 go vet ./...
GOOS=linux GOARCH=mips64 go vet ./...
GOOS=linux GOARCH=mips64le go vet ./...
GOOS=linux GOARCH=mips go vet ./...
GOOS=linux GOARCH=mipsle go vet ./...
GOOS=linux GOARCH=ppc64le go vet ./...
GOOS=linux GOARCH=ppc64 go vet ./...
GOOS=linux GOARCH=riscv64 go vet ./...
GOOS=linux GOARCH=s390x go vet ./...
GOOS=linux GOARCH=386 go120 vet ./...
GOOS=linux GOARCH=amd64 go120 vet ./...
GOOS=linux GOARCH=arm64 go120 vet ./...
GOOS=linux GOARCH=arm go120 vet ./...
GOOS=linux GOARCH=loong64 go120 vet ./...
GOOS=linux GOARCH=mips64 go120 vet ./...
GOOS=linux GOARCH=mips64le go120 vet ./...
GOOS=linux GOARCH=mips go120 vet ./...
GOOS=linux GOARCH=mipsle go120 vet ./...
GOOS=linux GOARCH=ppc64le go120 vet ./...
GOOS=linux GOARCH=ppc64 go120 vet ./...
GOOS=linux GOARCH=riscv64 go120 vet ./...
GOOS=linux GOARCH=s390x go120 vet ./...

GOOS=netbsd GOARCH=amd64 go vet ./...
GOOS=netbsd GOARCH=amd64 go120 vet ./...

GOOS=openbsd GOARCH=386 go vet ./...
GOOS=openbsd GOARCH=amd64 go vet ./...
GOOS=openbsd GOARCH=386 go120 vet ./...
GOOS=openbsd GOARCH=amd64 go120 vet ./...

GOOS=solaris GOARCH=amd64 go vet ./...
GOOS=solaris GOARCH=amd64 go120 vet ./...

GOOS=windows GOARCH=amd64 go vet ./...
GOOS=windows GOARCH=386 go vet ./...
GOOS=windows GOARCH=amd64 go120 vet ./...
GOOS=windows GOARCH=386 go120 vet ./...

GOOS=plan9 GOARCH=amd64 go vet ./...
GOOS=plan9 GOARCH=386 go vet ./...
GOOS=plan9 GOARCH=amd64 go120 vet ./...
GOOS=plan9 GOARCH=386 go120 vet ./...

macos_test:
CGO_ENABLED=0 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
CGO_ENABLED=1 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
CGO_ENABLED=0 GOOS=darwin go120 test ./... | $(BUILD_FAIL_PATTERN)
CGO_ENABLED=1 GOOS=darwin go120 test ./... | $(BUILD_FAIL_PATTERN)

init_tools:
go get github.com/golang/dep/cmd/dep
Expand Down
9 changes: 9 additions & 0 deletions cpu/cpu_netbsd_amd64.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package cpu

type cpuTimes struct {
User uint64
Nice uint64
Sys uint64
Intr uint64
Idle uint64
}
45 changes: 45 additions & 0 deletions disk/disk_netbsd_amd64.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions mem/mem_bsd.go
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build freebsd || openbsd
// +build freebsd openbsd
//go:build freebsd || openbsd || netbsd
// +build freebsd openbsd netbsd

package mem

Expand Down

0 comments on commit 826037f

Please sign in to comment.