From 267feeab1449055b1d00f83ddb12b0b42da8a5c5 Mon Sep 17 00:00:00 2001 From: Zach Klippenstein Date: Sun, 22 May 2016 08:10:50 -0700 Subject: [PATCH] Added a Makefile and used for CI. --- .travis.yml | 6 ++++-- Makefile | 13 +++++++++++++ devicedescriptortype_string.go | 4 ++-- devicestate_string.go | 4 ++-- util/errcode_string.go | 4 ++-- 5 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 Makefile diff --git a/.travis.yml b/.travis.yml index 8fa29de..e81ce66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,7 @@ go: - tip install: - # Needed for tip (394ac81) - - go get -t -v ./... + - make get-deps + +script: + - make test diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9271548 --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +.PHONY: test generate get-deps + +test: generate + go test -v -race ./... + +generate: + # stringer requires the packages to be installed. + go install -v + go generate -x ./... + +get-deps: + go get -t -v ./... + go get -u golang.org/x/tools/cmd/stringer diff --git a/devicedescriptortype_string.go b/devicedescriptortype_string.go index 6ad6484..89a4e3d 100644 --- a/devicedescriptortype_string.go +++ b/devicedescriptortype_string.go @@ -1,4 +1,4 @@ -// generated by stringer -type=deviceDescriptorType; DO NOT EDIT +// Code generated by "stringer -type=deviceDescriptorType"; DO NOT EDIT package adb @@ -9,7 +9,7 @@ const _deviceDescriptorType_name = "DeviceAnyDeviceSerialDeviceUsbDeviceLocal" var _deviceDescriptorType_index = [...]uint8{0, 9, 21, 30, 41} func (i deviceDescriptorType) String() string { - if i < 0 || i+1 >= deviceDescriptorType(len(_deviceDescriptorType_index)) { + if i < 0 || i >= deviceDescriptorType(len(_deviceDescriptorType_index)-1) { return fmt.Sprintf("deviceDescriptorType(%d)", i) } return _deviceDescriptorType_name[_deviceDescriptorType_index[i]:_deviceDescriptorType_index[i+1]] diff --git a/devicestate_string.go b/devicestate_string.go index 91347fe..77ac037 100644 --- a/devicestate_string.go +++ b/devicestate_string.go @@ -1,4 +1,4 @@ -// generated by stringer -type=DeviceState; DO NOT EDIT +// Code generated by "stringer -type=DeviceState"; DO NOT EDIT package adb @@ -9,7 +9,7 @@ const _DeviceState_name = "StateDisconnectedStateOfflineStateOnline" var _DeviceState_index = [...]uint8{0, 17, 29, 40} func (i DeviceState) String() string { - if i < 0 || i+1 >= DeviceState(len(_DeviceState_index)) { + if i < 0 || i >= DeviceState(len(_DeviceState_index)-1) { return fmt.Sprintf("DeviceState(%d)", i) } return _DeviceState_name[_DeviceState_index[i]:_DeviceState_index[i+1]] diff --git a/util/errcode_string.go b/util/errcode_string.go index 7ac33f7..22f81cc 100644 --- a/util/errcode_string.go +++ b/util/errcode_string.go @@ -1,4 +1,4 @@ -// generated by stringer -type=ErrCode; DO NOT EDIT +// Code generated by "stringer -type=ErrCode"; DO NOT EDIT package util @@ -9,7 +9,7 @@ const _ErrCode_name = "AssertionErrorParseErrorServerNotAvailableNetworkErrorCon var _ErrCode_index = [...]uint8{0, 14, 24, 42, 54, 74, 82, 96, 112} func (i ErrCode) String() string { - if i+1 >= ErrCode(len(_ErrCode_index)) { + if i >= ErrCode(len(_ErrCode_index)-1) { return fmt.Sprintf("ErrCode(%d)", i) } return _ErrCode_name[_ErrCode_index[i]:_ErrCode_index[i+1]]