From 0b71ca38e77c24725f2d90477eabefa81acea700 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 9 May 2014 08:32:47 -0500 Subject: [PATCH] Reorganize tests Signed-off-by: Felipe Contreras --- test/.gitignore | 3 +++ test/Makefile | 2 +- test-hg-bidi.sh => test/bidi.t | 2 +- test-hg-hg-git.sh => test/hg-git.t | 2 +- test-hg.sh => test/main.t | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 test/.gitignore rename test-hg-bidi.sh => test/bidi.t (98%) rename test-hg-hg-git.sh => test/hg-git.t (99%) rename test-hg.sh => test/main.t (99%) diff --git a/test/.gitignore b/test/.gitignore new file mode 100644 index 0000000..ebca265 --- /dev/null +++ b/test/.gitignore @@ -0,0 +1,3 @@ +test-results/ +trash directory.*/ +.prove diff --git a/test/Makefile b/test/Makefile index 8d85ee8..f48bf71 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,6 +1,6 @@ RM ?= rm -f -T = $(wildcard ../test-*.sh) +T = $(wildcard *.t) TEST_DIRECTORY := $(CURDIR) export TEST_DIRECTORY diff --git a/test-hg-bidi.sh b/test/bidi.t similarity index 98% rename from test-hg-bidi.sh rename to test/bidi.t index e24c51d..c9b4a14 100755 --- a/test-hg-bidi.sh +++ b/test/bidi.t @@ -16,7 +16,7 @@ then test_done fi -if ! python -c 'import mercurial' +if ! python -c 'import mercurial' > /dev/null 2>&1 then skip_all='skipping remote-hg tests; mercurial not available' test_done diff --git a/test-hg-hg-git.sh b/test/hg-git.t similarity index 99% rename from test-hg-hg-git.sh rename to test/hg-git.t index 6dcd95d..49a2092 100755 --- a/test-hg-hg-git.sh +++ b/test/hg-git.t @@ -22,7 +22,7 @@ then test_done fi -if ! python -c 'import hggit' +if ! python -c 'import hggit' > /dev/null 2>&1 then skip_all='skipping remote-hg tests; hg-git not available' test_done diff --git a/test-hg.sh b/test/main.t similarity index 99% rename from test-hg.sh rename to test/main.t index 5d128a5..2269af2 100755 --- a/test-hg.sh +++ b/test/main.t @@ -17,7 +17,7 @@ then test_done fi -if ! python -c 'import mercurial' +if ! python -c 'import mercurial' > /dev/null 2>&1 then skip_all='skipping remote-hg tests; mercurial not available' test_done