diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-07 14:33:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-07 14:33:02 -0700 |
| commit | 41e9da40a839597bbc49b6d9d3194b28c63f7dba (patch) | |
| tree | 01d49edf7432d7f1954c236ccc4ac38987d69b90 | |
| parent | cd5123da9b577efed4c968b2836d9a8dd11cc6fd (diff) | |
| parent | 091e051e883a3b710430b11fea06e5ea735ec9dd (diff) | |
| download | git-41e9da40a839597bbc49b6d9d3194b28c63f7dba.tar.gz git-41e9da40a839597bbc49b6d9d3194b28c63f7dba.tar.xz | |
Merge branch 'fc/remote-helpers-test-updates'
* fc/remote-helpers-test-updates:
remote-hg: fix hg-git test-case
remote-bzr: remove stale check code for tests
remote-helpers: fix the run of all tests
remote-bzr: avoid echo -n
| -rw-r--r-- | contrib/remote-helpers/Makefile | 1 | ||||
| -rwxr-xr-x | contrib/remote-helpers/test-bzr.sh | 16 | ||||
| -rwxr-xr-x | contrib/remote-helpers/test-hg-hg-git.sh | 1 |
3 files changed, 2 insertions, 16 deletions
diff --git a/contrib/remote-helpers/Makefile b/contrib/remote-helpers/Makefile index 9a76575f7..239161de3 100644 --- a/contrib/remote-helpers/Makefile +++ b/contrib/remote-helpers/Makefile @@ -3,6 +3,7 @@ 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 $@ diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh index 4d71f711a..f4c77681d 100755 --- a/contrib/remote-helpers/test-bzr.sh +++ b/contrib/remote-helpers/test-bzr.sh @@ -17,20 +17,6 @@ if ! "$PYTHON_PATH" -c 'import bzrlib'; then test_done fi -cmd=' -import bzrlib -bzrlib.initialize() -import bzrlib.plugin -bzrlib.plugin.load_plugins() -import bzrlib.plugins.fastimport -' - -if ! "$PYTHON_PATH" -c "$cmd"; then - echo "consider setting BZR_PLUGIN_PATH=$HOME/.bazaar/plugins" 1>&2 - skip_all='skipping remote-bzr tests; bzr-fastimport not available' - test_done -fi - check () { (cd $1 && git log --format='%s' -1 && @@ -136,7 +122,7 @@ test_expect_success 'special modes' ' (cd gitrepo && git cat-file -p HEAD:link > ../actual) && - echo -n content > expected && + printf content > expected && test_cmp expected actual ' diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh index 7e3967f5b..3f253b7de 100755 --- a/contrib/remote-helpers/test-hg-hg-git.sh +++ b/contrib/remote-helpers/test-hg-hg-git.sh @@ -140,7 +140,6 @@ test_expect_success 'executable bit' ' git_clone_$x hgrepo-$x gitrepo2-$x && git_log gitrepo2-$x > log-$x done && - cp -r log-* output-* /tmp/foo/ && test_cmp output-hg output-git && test_cmp log-hg log-git |