From 35b19d074e117f14219b840f55f374ec5d1ecb68 Mon Sep 17 00:00:00 2001
From: UK992 <urbankrajnc92@gmail.com>
Date: Fri, 23 Sep 2016 04:24:34 +0200
Subject: [PATCH 1/2] Fix Appveyor

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

diff --git a/appveyor.yml b/appveyor.yml
index f75c29e6ed3..a313b572d5b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,6 @@ version: 1.0.{build}
 
 environment:
   RUST_BACKTRACE: 1
-  HOME: '%APPVEYOR_BUILD_FOLDER%'
   # The appveyor image we use has a pretty huge set of things installed... we make the
   # initial PATH something sane so we know what to expect
   PATH: "C:\\windows\\system32;\
@@ -69,6 +68,6 @@ install:
 
 build_script:
   - if %BUILD_ENV%==msvc mach build -d -v && mach test-unit
-  - if %BUILD_ENV%==gnu  bash -lc "./mach build -d -v && ./mach test-unit"
+  - if %BUILD_ENV%==gnu  bash -lc "cd $APPVEYOR_BUILD_FOLDER; ./mach build -d -v && ./mach test-unit"
 
 test: off

From d695b975613fefc77d5dfebf3f153dc84cde8196 Mon Sep 17 00:00:00 2001
From: UK992 <urbankrajnc92@gmail.com>
Date: Fri, 23 Sep 2016 04:27:29 +0200
Subject: [PATCH 2/2] Reorder steps in Travis to avoid rebuilding on `mach
 test-unit`

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1f71944887..186d479af02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,10 @@ matrix:
       dist: trusty
       script:
          - ./mach build -d --verbose
+         - ./mach test-compiletest
+         - ./mach test-unit
          - ./mach build-geckolib
          - ./mach test-geckolib
-         - ./mach test-unit
-         - ./mach test-compiletest
          - bash etc/ci/check_no_unwrap.sh
          - bash etc/ci/lockfile_changed.sh
          - bash etc/ci/manifest_changed.sh