From 83295f1e085fd9e6e5c16b6942256417d8002f6e Mon Sep 17 00:00:00 2001
From: Nathan Ross <nross.se@gmail.com>
Date: Wed, 23 Dec 2015 22:59:04 -0500
Subject: [PATCH] appveyor and windows testing tooling updates

---
 appveyor.yml         | 2 --
 tests/common/util.rs | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b571c1390..5454b76f4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,8 +26,6 @@ install:
 
 build_script:
   - call %MBASH% "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; exec 0</dev/null; make"
-  - call %MBASH% "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; exec 0</dev/null; make build-check"
 
 test_script:
   - call %MBASH% "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; exec 0</dev/null; make test"
-  - call %MBASH% "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; exec 0</dev/null; make test-check"
diff --git a/tests/common/util.rs b/tests/common/util.rs
index 6debdc775..43bf43986 100644
--- a/tests/common/util.rs
+++ b/tests/common/util.rs
@@ -16,7 +16,13 @@ use std::ffi::OsStr;
 use self::tempdir::TempDir;
 use std::rc::Rc;
 
+#[cfg(windows)]
+static PROGNAME: &'static str = "target\\debug\\uutils.exe";
+#[cfg(windows)]
+static FIXTURES_DIR: &'static str = "tests\\fixtures";
+#[cfg(not(windows))]
 static PROGNAME: &'static str = "target/debug/uutils";
+#[cfg(not(windows))]
 static FIXTURES_DIR: &'static str = "tests/fixtures";
 static ALREADY_RUN: &'static str = " you have already run this UCommand, if you want to run \
                                     another command in the same test, use TestSet::new instead of \