From 3e6ebb3b76405ec9a7158c8b01aa6447578508c1 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Wed, 5 Oct 2016 23:01:58 -0500
Subject: [PATCH 1/2] run the full test suite on osx

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7bea0f91..6e159cc21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,7 @@ script:
       sudo apt-get install -y qemu-user-static &&
       sh ci/run-docker.sh $TARGET;
     else
-      cargo test --target $TARGET &&
-      cargo test --target $TARGET --release;
+      sh ci/run.sh $TARGET;
     fi
   # Travis can't cache files that are not readable by "others"
   - chmod -R a+r $HOME/.cargo

From 24c2a15f3d868b348b6e78cbd52f8f40d7ff7f73 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Fri, 7 Oct 2016 14:29:34 -0500
Subject: [PATCH 2/2] fix path to .rlib on OSX

---
 ci/run.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ci/run.sh b/ci/run.sh
index 455bb2e40..7dc9be178 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -55,7 +55,13 @@ case $TRAVIS_OS_NAME in
 esac
 
 # NOTE On i586, It's normal that the get_pc_thunk symbol appears several times so ignore it
-stdout=$($PREFIX$NM -g --defined-only /target/${1}/debug/librustc_builtins.rlib)
+if [ $TRAVIS_OS_NAME = osx ]; then
+    path=target/${1}/debug/librustc_builtins.rlib
+else
+    path=/target/${1}/debug/librustc_builtins.rlib
+fi
+
+stdout=$($PREFIX$NM -g --defined-only $path)
 
 set +e
 echo "$stdout" | sort | uniq -d | grep -v __x86.get_pc_thunk | grep 'T __'