Merge pull request #1809 from Lomanic/issue1806

[net][host][aix] Fix build and Makefile
[host][aix] Remove redundant 'or' in parseUptime() found by 'go test'
4 changed files with 6 additions and 3 deletions
--- a/3
+++ b/3
@ -34,6 +34,7 @@ build_test:  ## test only buildable
 	GOOS=netbsd go test ./... | $(BUILD_FAIL_PATTERN)
 	GOOS=openbsd go test ./... | $(BUILD_FAIL_PATTERN)
 	GOOS=plan9 go test ./... | $(BUILD_FAIL_PATTERN)
+	CGO_ENABLED=0 GOOS=aix GOARCH=ppc64  go test ./... | $(BUILD_FAIL_PATTERN)

 ifeq ($(shell uname -s), Darwin)
 	CGO_ENABLED=1 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
@ -77,6 +78,8 @@ vet:
 	GOOS=plan9 GOARCH=amd64 go vet ./...
 	GOOS=plan9 GOARCH=386 go vet ./...

+	CGO_ENABLED=0 GOOS=aix GOARCH=ppc64 go vet ./...
+
 macos_test:
 	CGO_ENABLED=0 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
 	CGO_ENABLED=1 GOOS=darwin go test ./... | $(BUILD_FAIL_PATTERN)
--- a/host/host_aix.go
+++ b/host/host_aix.go
@ -110,7 +110,7 @@ func parseUptime(uptime string) uint64 {
 		if err != nil {
 			return 0
 		}
-	case ut[3] == "mins," || ut[3] == "mins,":
+	case ut[3] == "mins,":
 		mins, err = strconv.ParseUint(ut[2], 10, 64)
 		if err != nil {
 			return 0
--- a/net/net_aix_cgo.go
+++ b/net/net_aix_cgo.go
@ -30,7 +30,7 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
 		iocounters = append(iocounters, n)
 	}
 	if pernic == false {
-		return getIOCountersAll(iocounters)
+		return getIOCountersAll(iocounters), nil
 	}
 	return iocounters, nil
 }
--- a/net/net_aix_nocgo.go
+++ b/net/net_aix_nocgo.go
@ -89,7 +89,7 @@ func IOCountersWithContext(ctx context.Context, pernic bool) ([]IOCountersStat,
 		return nil, err
 	}
 	if pernic == false {
-		return getIOCountersAll(iocounters)
+		return getIOCountersAll(iocounters), nil
 	}
 	return iocounters, nil
 }
Author	SHA1	Message	Date
shirou	e2a7a9964d	Merge pull request #1809 from Lomanic/issue1806 [net][host][aix] Fix build and Makefile	1 week ago
Lomanic	ad534c24e9	[host][aix] Remove redundant 'or' in parseUptime() found by 'go test'	1 week ago
Lomanic	6c9cea2bae	[net][aix] Add missing return value in IOCountersWithContext() Amends #1797 Fixes #1806	1 week ago
Lomanic	3d0ecb18cf	feat: enable build test on aix	1 week ago