[lxc-devel] [go-lxc/v2] Add go1.12 to the test matrix and make unprivileged tests the default

[caglar10ur on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 351 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190427/e14bf22d/attachment.bin>
-------------- next part --------------
From b5f42f818cb83b8260982481bede99e0ee13f5d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= <caglar at 10ur.org>
Date: Tue, 26 Feb 2019 20:08:01 -0800
Subject: [PATCH] Add go1.12 to the test matrix and make unprivileged tests the
 default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>
---
 .travis.yml       |  6 +++---
 Makefile          | 12 ++++++------
 examples/Makefile |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index abff5d6..a67deb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ os:
   - linux
 
 go:
-  - "1.9"
   - "1.10"
   - "1.11"
+  - "1.12"
   - tip
 
 matrix:
@@ -40,8 +40,8 @@ script:
   - "make all"
   - "make test"
   - "make test-race"
-  - "make test-unprivileged"
-  - "make test-unprivileged-race"
+  - "make test-privileged"
+  - "make test-privileged-race"
   - "make cover"
 
 notifications:
diff --git a/Makefile b/Makefile
index 4f60152..8cdcb26 100644
--- a/Makefile
+++ b/Makefile
@@ -8,19 +8,19 @@ format:
 	@gofmt -s -w *.go
 	@goimports -w *.go || true
 
-test:
-	@echo "$(OK_COLOR)==> Running tests for priveleged user $(NO_COLOR)"
+test-privileged:
+	@echo "$(OK_COLOR)==> Running tests for privileged user $(NO_COLOR)"
 	@sudo `which go` test -v -coverprofile=/tmp/priv.out
 
-test-race:
-	@echo "$(OK_COLOR)==> Running tests with -race flag for priveleged user $(NO_COLOR)"
+test-privileged-race:
+	@echo "$(OK_COLOR)==> Running tests with -race flag for privileged user $(NO_COLOR)"
 	@sudo `which go` test -race -v
 
-test-unprivileged:
+test:
 	@echo "$(OK_COLOR)==> Running tests for unprivileged user $(NO_COLOR)"
 	@`which go` test -v -coverprofile=/tmp/unpriv.out
 
-test-unprivileged-race:
+test-race:
 	@echo "$(OK_COLOR)==> Running tests with -race flag for unprivileged user $(NO_COLOR)"
 	@`which go` test -race -v
 
diff --git a/examples/Makefile b/examples/Makefile
index 9d4c8cc..09121ab 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -24,7 +24,7 @@ format:
 
 vet:
 	@echo "$(OK_COLOR)==> Running go vet $(NO_COLOR)"
-	@$(foreach file,$(ALL_GO_FILES),go tool vet -all $(file);)
+	@$(foreach file,$(ALL_GO_FILES),go vet -all $(file);)
 
 lint:
 	@echo "$(OK_COLOR)==> Running golint $(NO_COLOR)"