root
/
helm
mirror of https://github.com/helm/helm.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allow tests to run on s390x (#7096) 

Signed-off-by: Vivian Kong <vivkong@ca.ibm.com>
This commit is contained in:
Vivian Kong 2020-01-17 10:39:26 -05:00 committed by Martin Hickey
parent c08daeca5f
commit 82823a6634
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -8,6 +8,7 @@ GOPATH = $(shell go env GOPATH)
DEP = $(GOPATH)/bin/dep
GOX = $(GOPATH)/bin/gox
GOIMPORTS = $(GOPATH)/bin/goimports
ARCH = $(shell uname -p)
ACCEPTANCE_DIR:=../acceptance-testing
# To specify the subset of acceptance tests to run. '.' means all tests
@ -67,7 +68,11 @@ $(BINDIR)/$(BINNAME): $(SRC)
.PHONY: test
test: build
ifeq ($(ARCH),s390x)
test: TESTFLAGS += -v
else
test: TESTFLAGS += -race -v
endif
test: test-style
test: test-unit

3
pkg/plugin/plugin_test.go
View File

@ -87,6 +87,7 @@ func TestPlatformPrepareCommand(t *testing.T) {
PlatformCommand: []PlatformCommand{
{OperatingSystem: "linux", Architecture: "i386", Command: "echo -n linux-i386"},
{OperatingSystem: "linux", Architecture: "amd64", Command: "echo -n linux-amd64"},
{OperatingSystem: "linux", Architecture: "s390x", Command: "echo -n linux-s390x"},
{OperatingSystem: "windows", Architecture: "amd64", Command: "echo -n win-64"},
},
},
@ -98,6 +99,8 @@ func TestPlatformPrepareCommand(t *testing.T) {
osStrCmp = "linux-i386"
} else if os == "linux" && arch == "amd64" {
osStrCmp = "linux-amd64"
} else if os == "linux" && arch == "s390x" {
osStrCmp = "linux-s390x"
} else if os == "windows" && arch == "amd64" {
osStrCmp = "win-64"
} else {