From 7ee68ade0fb349e6c32991757b97ee0730775083 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sun, 20 Apr 2014 16:27:03 -0500
Subject: [PATCH] remote-helpers: move tests out of contrib

They should be tested by default.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/remote-helpers/Makefile                    | 14 --------------
 .../test-hg.sh => t/t5810-remote-hg.sh             |  3 +--
 .../test-hg-bidi.sh => t/t5811-remote-hg-bidi.sh   |  3 +--
 .../t5812-remote-hg-hg-git.sh                      |  3 +--
 .../test-bzr.sh => t/t5820-remote-bzr.sh           |  3 +--
 5 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 contrib/remote-helpers/Makefile
 rename contrib/remote-helpers/test-hg.sh => t/t5810-remote-hg.sh (99%)
 rename contrib/remote-helpers/test-hg-bidi.sh => t/t5811-remote-hg-bidi.sh (98%)
 rename contrib/remote-helpers/test-hg-hg-git.sh => t/t5812-remote-hg-hg-git.sh (99%)
 rename contrib/remote-helpers/test-bzr.sh => t/t5820-remote-bzr.sh (98%)

diff --git a/contrib/remote-helpers/Makefile b/contrib/remote-helpers/Makefile
deleted file mode 100644
index 239161de33..0000000000
--- a/contrib/remote-helpers/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-TESTS := $(wildcard test*.sh)
-
-export T := $(addprefix $(CURDIR)/,$(TESTS))
-export MAKE := $(MAKE) -e
-export PATH := $(CURDIR):$(PATH)
-export TEST_LINT := test-lint-executable test-lint-shell-syntax
-
-test:
-	$(MAKE) -C ../../t $@
-
-$(TESTS):
-	$(MAKE) -C ../../t $(CURDIR)/$@
-
-.PHONY: $(TESTS)
diff --git a/contrib/remote-helpers/test-hg.sh b/t/t5810-remote-hg.sh
similarity index 99%
rename from contrib/remote-helpers/test-hg.sh
rename to t/t5810-remote-hg.sh
index 3b59e829f9..471153a4b9 100755
--- a/contrib/remote-helpers/test-hg.sh
+++ b/t/t5810-remote-hg.sh
@@ -8,8 +8,7 @@
 
 test_description='Test remote-hg'
 
-test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=${0%/*}/../../t
-. "$TEST_DIRECTORY"/test-lib.sh
+. ./test-lib.sh
 
 if ! test_have_prereq PYTHON
 then
diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/t/t5811-remote-hg-bidi.sh
similarity index 98%
rename from contrib/remote-helpers/test-hg-bidi.sh
rename to t/t5811-remote-hg-bidi.sh
index d44ec922af..d738ed44c5 100755
--- a/contrib/remote-helpers/test-hg-bidi.sh
+++ b/t/t5811-remote-hg-bidi.sh
@@ -8,8 +8,7 @@
 
 test_description='Test bidirectionality of remote-hg'
 
-test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=${0%/*}/../../t
-. "$TEST_DIRECTORY"/test-lib.sh
+. ./test-lib.sh
 
 if ! test_have_prereq PYTHON
 then
diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/t/t5812-remote-hg-hg-git.sh
similarity index 99%
rename from contrib/remote-helpers/test-hg-hg-git.sh
rename to t/t5812-remote-hg-hg-git.sh
index d0d186c95f..50c216f9b5 100755
--- a/contrib/remote-helpers/test-hg-hg-git.sh
+++ b/t/t5812-remote-hg-hg-git.sh
@@ -8,8 +8,7 @@
 
 test_description='Test remote-hg output compared to hg-git'
 
-test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=${0%/*}/../../t
-. "$TEST_DIRECTORY"/test-lib.sh
+. ./test-lib.sh
 
 if ! test_have_prereq PYTHON
 then
diff --git a/contrib/remote-helpers/test-bzr.sh b/t/t5820-remote-bzr.sh
similarity index 98%
rename from contrib/remote-helpers/test-bzr.sh
rename to t/t5820-remote-bzr.sh
index 37dc31dc78..02d82a4ed8 100755
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/t/t5820-remote-bzr.sh
@@ -5,8 +5,7 @@
 
 test_description='Test remote-bzr'
 
-test -n "$TEST_DIRECTORY" || TEST_DIRECTORY=${0%/*}/../../t
-. "$TEST_DIRECTORY"/test-lib.sh
+. ./test-lib.sh
 
 if ! test_have_prereq PYTHON
 then
-- 
2.32.0.93.g670b81a890