Merge branch 'fc/remote-helpers-test-updates'
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Apr 2013 21:33:02 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Apr 2013 21:33:02 +0000 (14:33 -0700)
* 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

contrib/remote-helpers/Makefile
contrib/remote-helpers/test-bzr.sh
contrib/remote-helpers/test-hg-hg-git.sh
index 9a76575f78f7c2cc6154c0a0d57f732de1e7f5d9..239161de33373d4ca97581a242cac848463fbbf3 100644 (file)
@@ -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 $@
index 4d71f711a6d032acfe4c1dc92d1c308ee56b1b80..f4c77681dd8c8d12d07c76a6cb681dbe5d292445 100755 (executable)
@@ -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
 '
 
index 7e3967f5b6f0c19939bf1c0c30be0d756ec6aa04..3f253b7de75a6fa44c4cff3b2e1f53f9feffcf5d 100755 (executable)
@@ -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