squash merge from dev branch

vendor/go.uber.org/atomic/scripts/cover.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+COVER=cover
+ROOT_PKG=go.uber.org/atomic
+
+if [[ -d "$COVER" ]]; then
+	rm -rf "$COVER"
+fi
+mkdir -p "$COVER"
+
+i=0
+for pkg in "$@"; do
+	i=$((i + 1))
+
+	extracoverpkg=""
+	if [[ -f "$GOPATH/src/$pkg/.extra-coverpkg" ]]; then
+		extracoverpkg=$( \
+			sed -e "s|^|$pkg/|g" < "$GOPATH/src/$pkg/.extra-coverpkg" \
+			| tr '\n' ',')
+	fi
+
+	coverpkg=$(go list -json "$pkg" | jq -r '
+		.Deps
+		| map(select(startswith("'"$ROOT_PKG"'")))
+		| map(select(contains("/vendor/") | not))
+		| . + ["'"$pkg"'"]
+		| join(",")
+	')
+	if [[ -n "$extracoverpkg" ]]; then
+		coverpkg="$extracoverpkg$coverpkg"
+	fi
+
+	go test \
+		-coverprofile "$COVER/cover.${i}.out" -coverpkg "$coverpkg" \
+		-v "$pkg"
+done
+
+gocovmerge "$COVER"/*.out > cover.out

vendor/go.uber.org/atomic/scripts/test-ubergo.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -euox pipefail
+IFS=$'\n\t'
+
+# This script creates a fake GOPATH, symlinks in the current
+# directory as uber-go/atomic and verifies that tests still pass.
+
+WORK_DIR=`mktemp -d`
+function cleanup {
+	rm -rf "$WORK_DIR"
+}
+trap cleanup EXIT
+
+
+export GOPATH="$WORK_DIR"
+PKG_PARENT="$WORK_DIR/src/github.com/uber-go"
+PKG_DIR="$PKG_PARENT/atomic"
+
+mkdir -p "$PKG_PARENT"
+cp -R `pwd` "$PKG_DIR"
+cd "$PKG_DIR"
+
+# The example imports go.uber.org, fix the import.
+sed -e 's/go.uber.org\/atomic/github.com\/uber-go\/atomic/' -i="" example_test.go
+
+make test