Skip to content

Commit

Permalink
Merge branch 'fc/remote-helpers-test-updates'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Junio C Hamano committed Apr 7, 2013
2 parents cd5123d + 091e051 commit 41e9da4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 16 deletions.
1 change: 1 addition & 0 deletions contrib/remote-helpers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
Expand Down
16 changes: 1 addition & 15 deletions contrib/remote-helpers/test-bzr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down Expand Up @@ -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
'

Expand Down
1 change: 0 additions & 1 deletion contrib/remote-helpers/test-hg-hg-git.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 41e9da4

Please sign in to comment.