From c572a8d95d8fa184eb58b15b7ff96d01ef1f9ec3 Mon Sep 17 00:00:00 2001 From: Kostis Anagnostopoulos Date: Tue, 27 Sep 2016 00:09:20 +0200 Subject: Win, #519: FIX undead Git-daemon on Windows + On MINGW-git, daemon exists but if invoked as 'git daemon', DAEMON CANNOT DIE! + So, launch `git-daemon` on Apveyor, but - remote TCs fail due to paths problems. + Updated README instructions on Windows. + Restore disabled remote TCs on Windows. + Disable failures on daemon-tests only the last moment (raise SkipTest) so when ready, it will also pass. --- .appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to '.appveyor.yml') diff --git a/.appveyor.yml b/.appveyor.yml index fefd9478..7863d6d5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,6 +4,7 @@ environment: matrix: - PYTHON: "C:\\Python27" PYTHON_VERSION: "2.7" + GIT_PATH: "C:\\Program Files\\Git\\mingw64\\libexec\\git-core" - PYTHON: "C:\\Miniconda" PYTHON_VERSION: "2.7" IS_CONDA: "yes" @@ -12,12 +13,14 @@ environment: - PYTHON: "C:\\Miniconda3-x64" PYTHON_VERSION: "3.4" IS_CONDA: "yes" + GIT_PATH: "C:\\Program Files\\Git\\mingw64\\libexec\\git-core" - PYTHON: "C:\\Python34" PYTHON_VERSION: "3.4" GIT_PATH: "C:\\cygwin64\\bin" - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5" + GIT_PATH: "C:\\Program Files\\Git\\mingw64\\libexec\\git-core" - PYTHON: "C:\\Python35-x64" PYTHON_VERSION: "3.5" GIT_PATH: "C:\\cygwin64\\bin" @@ -29,8 +32,7 @@ install: # - | uname -a - where git - where python pip + where git git-daemon python pip python --version python -c "import struct; print(struct.calcsize('P') * 8)" -- cgit v1.2.3