Fix Go tip errors with self-import (#14)

uber-go · Oct 27, 2016 · 9e99152 · 9e99152
1 parent 0ab9959
commit 9e99152
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/example_test.go b/example_test.go
@@ -18,12 +18,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package atomic
+package atomic_test
 
 import (
 	"fmt"
 
-	atomic "."
+	"go.uber.org/atomic"
 )
 
 func Example() {

diff --git a/scripts/test-ubergo.sh b/scripts/test-ubergo.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -euo pipefail
+set -euox pipefail
 IFS=$'\n\t'
 
 # This script creates a fake GOPATH, symlinks in the current
@@ -17,7 +17,10 @@ PKG_PARENT="$WORK_DIR/src/github.com/uber-go"
 PKG_DIR="$PKG_PARENT/atomic"
 
 mkdir -p "$PKG_PARENT"
-ln -s `pwd` "$PKG_DIR"
+cp -R `pwd` "$PKG_DIR"
 cd "$PKG_DIR"
 
-make test
+# 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