From bd6f46f37877bb71004d64622eaeccdda0dc3d14 Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Tue, 19 Sep 2017 12:56:21 -0400 Subject: [PATCH] msvc: get rid of the MSVC_DEPS variable As we do not consume NuGet packages any longer, there is no sense to try to point PATH to their unpacked .dll files, either. Signed-off-by: Jeff Hostetler Signed-off-by: Johannes Schindelin --- Makefile | 3 --- t/test-lib.sh | 3 --- 2 files changed, 6 deletions(-) diff --git a/Makefile b/Makefile index 6a1abada99..6cd77545f3 100644 --- a/Makefile +++ b/Makefile @@ -2604,9 +2604,6 @@ ifdef GIT_INTEROP_MAKE_OPTS endif ifdef TEST_GIT_INDEX_VERSION @echo TEST_GIT_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(TEST_GIT_INDEX_VERSION)))'\' >>$@+ -endif -ifdef MSVC_DEPS - @echo MSVC_DEPS=\''$(subst ','\'',$(subst ','\'',$(MSVC_DEPS)))'\' >>$@+ endif @if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi diff --git a/t/test-lib.sh b/t/test-lib.sh index bac9221a7b..cfdcbb847e 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -66,9 +66,6 @@ fi . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS export PERL_PATH SHELL_PATH -test -z "$MSVC_DEPS" || -PATH="$GIT_BUILD_DIR/$MSVC_DEPS/bin$PATH_SEP$PATH" - ################################################################ # It appears that people try to run tests without building... test -n "$GIT_TEST_INSTALLED" || "$GIT_BUILD_DIR/git$X" >/dev/null ||