Fix 32bit-x86 typo in testsuite

The GOARCH here is 386 not i386. This caused a slightly odd test
suite failure on that architecture:

--- FAIL: TestPlatformPrepareCommand (0.00s)
     plugin_test.go:45: Expected arg="os-arch", got "linux-s390x"
     plugin_test.go:64: Expected arg="os-arch", got "linux-s390x"

Signed-off-by: Dirk Müller <dirk@dmllr.de>
(cherry picked from commit 1fc8369356)
release-3.11
Dirk Müller 2 years ago committed by Matt Farina
parent 88b2db4a07
commit 272f6b9d80
No known key found for this signature in database
GPG Key ID: 92C44A3D421FF7F9

@ -86,7 +86,7 @@ func TestPlatformPrepareCommand(t *testing.T) {
Name: "test", Name: "test",
Command: "echo -n os-arch", Command: "echo -n os-arch",
PlatformCommand: []PlatformCommand{ PlatformCommand: []PlatformCommand{
{OperatingSystem: "linux", Architecture: "i386", Command: "echo -n linux-i386"}, {OperatingSystem: "linux", Architecture: "386", Command: "echo -n linux-386"},
{OperatingSystem: "linux", Architecture: "amd64", Command: "echo -n linux-amd64"}, {OperatingSystem: "linux", Architecture: "amd64", Command: "echo -n linux-amd64"},
{OperatingSystem: "linux", Architecture: "arm64", Command: "echo -n linux-arm64"}, {OperatingSystem: "linux", Architecture: "arm64", Command: "echo -n linux-arm64"},
{OperatingSystem: "linux", Architecture: "ppc64le", Command: "echo -n linux-ppc64le"}, {OperatingSystem: "linux", Architecture: "ppc64le", Command: "echo -n linux-ppc64le"},
@ -98,8 +98,8 @@ func TestPlatformPrepareCommand(t *testing.T) {
var osStrCmp string var osStrCmp string
os := runtime.GOOS os := runtime.GOOS
arch := runtime.GOARCH arch := runtime.GOARCH
if os == "linux" && arch == "i386" { if os == "linux" && arch == "386" {
osStrCmp = "linux-i386" osStrCmp = "linux-386"
} else if os == "linux" && arch == "amd64" { } else if os == "linux" && arch == "amd64" {
osStrCmp = "linux-amd64" osStrCmp = "linux-amd64"
} else if os == "linux" && arch == "arm64" { } else if os == "linux" && arch == "arm64" {
@ -125,7 +125,7 @@ func TestPartialPlatformPrepareCommand(t *testing.T) {
Name: "test", Name: "test",
Command: "echo -n os-arch", Command: "echo -n os-arch",
PlatformCommand: []PlatformCommand{ PlatformCommand: []PlatformCommand{
{OperatingSystem: "linux", Architecture: "i386", Command: "echo -n linux-i386"}, {OperatingSystem: "linux", Architecture: "386", Command: "echo -n linux-386"},
{OperatingSystem: "windows", Architecture: "amd64", Command: "echo -n win-64"}, {OperatingSystem: "windows", Architecture: "amd64", Command: "echo -n win-64"},
}, },
}, },
@ -134,7 +134,7 @@ func TestPartialPlatformPrepareCommand(t *testing.T) {
os := runtime.GOOS os := runtime.GOOS
arch := runtime.GOARCH arch := runtime.GOARCH
if os == "linux" { if os == "linux" {
osStrCmp = "linux-i386" osStrCmp = "linux-386"
} else if os == "windows" && arch == "amd64" { } else if os == "windows" && arch == "amd64" {
osStrCmp = "win-64" osStrCmp = "win-64"
} else { } else {
@ -166,7 +166,7 @@ func TestNoMatchPrepareCommand(t *testing.T) {
Metadata: &Metadata{ Metadata: &Metadata{
Name: "test", Name: "test",
PlatformCommand: []PlatformCommand{ PlatformCommand: []PlatformCommand{
{OperatingSystem: "no-os", Architecture: "amd64", Command: "echo -n linux-i386"}, {OperatingSystem: "no-os", Architecture: "amd64", Command: "echo -n linux-386"},
}, },
}, },
} }

Loading…
Cancel
Save