mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
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
This commit is contained in:
commit
41e9da40a8
3 changed files with 2 additions and 16 deletions
|
@ -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 $@
|
||||
|
|
|
@ -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
|
||||
'
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue