Consolidate how we are calling the tests

.travis.yml

@@ -26,7 +26,7 @@ jobs:
       install: skip
       env:
         - DEPTESTBYPASS501=1
-      script: go test -race ./...
+      script: make test
     - <<: *simple-test
       go: tip
     - <<: *simple-test
@@ -46,7 +46,7 @@ jobs:
         # for future safety.
         # Related: https://superuser.com/questions/1044130/why-am-i-having-how-can-i-fix-this-error-shell-session-update-command-not-f
         - trap EXIT
-        - go test -race ./...
+        - make test
     - go: 1.10.x
       stage: deploy
       go_import_path: github.com/golang/dep

Makefile

@@ -23,7 +23,7 @@ validate: build licenseok
 	./hack/validate-licence.bash
 
 test:
-	go test ./...
+	./hack/test.bash
 
 install: build
 	cp ./dep $(GOBIN)

appveyor.yml

@@ -31,4 +31,4 @@ deploy: false
 
 test_script:
   - go build github.com/golang/dep/cmd/dep
-  - for /f "" %%G in ('go list github.com/golang/dep/...') do ( go test %%G & IF ERRORLEVEL == 1 EXIT 1)
+  - go test ./...

hack/test.bash

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Copyright 2017 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+#
+# This script will build dep and calculate hash for each
+# (DEP_BUILD_PLATFORMS, DEP_BUILD_ARCHS) pair.
+# DEP_BUILD_PLATFORMS="linux" DEP_BUILD_ARCHS="amd64" ./hack/build-all.bash
+# can be called to build only for linux-amd64
+
+set -e
+
+IMPORT_DURING_SOLVE=${IMPORT_DURING_SOLVE:-false}
+
+go test -race \
+    -ldflags '-X github.com/golang/dep/cmd/dep.flagImportDuringSolve=${IMPORT_DURING_SOLVE}' \
+    ./...