From 6c3af74fa5b59d325e597106f6ef94b9b413685c Mon Sep 17 00:00:00 2001
From: Wayne Ashley Berry <wayneashleyberry@gmail.com>
Date: Mon, 2 Apr 2018 21:28:30 +0200
Subject: [PATCH] Run tests with the race detector

At some point recently this was fixed (maybe investigate more and
figure out how/why this has been resolved?)

Add Go 1.10 to Travis CI.
---
 .travis.yml | 10 ++++++----
 AUTHORS.txt |  1 +
 Makefile    |  5 ++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 024ad70..868519b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,14 @@ go_import_path: github.com/kevinburke/ssh_config
 language: go
 
 go:
-  - 1.7
-  - 1.8
-  - tip
+  - 1.7.x
+  - 1.8.x
+  - 1.9.x
+  - 1.10.x
+  - master
 
 before_script:
     - go get -u ./...
 
 script:
-    - make test
+    - make race-test
diff --git a/AUTHORS.txt b/AUTHORS.txt
index b29d4fd..51b98f8 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,3 +1,4 @@
 Eugene Terentev <eugene@terentev.net>
 Kevin Burke <kev@inburke.com>
 Sergey Lukjanov <me@slukjanov.name>
+Wayne Ashley Berry <wayneashleyberry@gmail.com>
diff --git a/Makefile b/Makefile
index b685b35..1bcda45 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,10 @@ lint: $(MEGACHECK)
 
 test: lint
 	@# the timeout helps guard against infinite recursion
-	go test -timeout=50ms ./...
+	go test -timeout=250ms ./...
+
+race-test: lint
+	go test -timeout=500ms -race ./...
 
 $(BUMP_VERSION):
 	go get -u github.com/Shyp/bump_version