From 80112d198d8bc429d91c8984878e858cd832b802 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 23 Jun 2017 21:23:52 -0700
Subject: [PATCH] Use the same CI script on AppVeyor

---
 library/compiler-builtins/appveyor.yml | 14 +++-----------
 library/compiler-builtins/ci/run.sh    |  6 +++---
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/library/compiler-builtins/appveyor.yml b/library/compiler-builtins/appveyor.yml
index 70049bf5130c..6a602132f65b 100644
--- a/library/compiler-builtins/appveyor.yml
+++ b/library/compiler-builtins/appveyor.yml
@@ -10,7 +10,6 @@ environment:
       MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
       MINGW_DIR: mingw32
     - TARGET: x86_64-pc-windows-gnu
-      MSYS_BITS: 64
 
 install:
   - git submodule update --init
@@ -18,8 +17,8 @@ install:
   - rustup-init.exe --default-host x86_64-pc-windows-msvc --default-toolchain nightly -y
   - if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%
 
-  # Use the system msys if we can
-  - if defined MSYS_BITS set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
+  # Use the system msys
+  - set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
 
   # download a custom compiler otherwise
   - if defined MINGW_URL appveyor DownloadFile %MINGW_URL%/%MINGW_ARCHIVE%
@@ -32,11 +31,4 @@ install:
 build: false
 
 test_script:
-  - cargo build --target %TARGET%
-  - cargo build --target %TARGET% --features c --example intrinsics
-  - cargo build --release --target %TARGET%
-  - cargo build --release --target %TARGET% --features c --example intrinsics
-  - cargo test --no-default-features --features gen-tests --target %TARGET%
-  - cargo test --no-default-features --features "gen-tests c" --target %TARGET%
-  - cargo test --no-default-features --features gen-tests --release --target %TARGET%
-  - cargo test --no-default-features --features "gen-tests c" --release --target %TARGET%
+  - sh ci/run.sh %TARGET%
diff --git a/library/compiler-builtins/ci/run.sh b/library/compiler-builtins/ci/run.sh
index f61b90f81759..c727bdfb9694 100755
--- a/library/compiler-builtins/ci/run.sh
+++ b/library/compiler-builtins/ci/run.sh
@@ -75,10 +75,10 @@ case "$TRAVIS_OS_NAME" in
         ;;
 esac
 
-if [ "$TRAVIS_OS_NAME" = osx ]; then
-    path=target/${1}/debug/deps/libcompiler_builtins-*.rlib
-else
+if [ -d /target ]; then
     path=/target/${1}/debug/deps/libcompiler_builtins-*.rlib
+else
+    path=target/${1}/debug/deps/libcompiler_builtins-*.rlib
 fi
 
 # Look out for duplicated symbols when we include the compiler-rt (C) implementation