Skip to content

Commit 41e9da4

Browse files
committed
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
2 parents cd5123d + 091e051 commit 41e9da4

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

contrib/remote-helpers/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ TESTS := $(wildcard test*.sh)
33
export T := $(addprefix $(CURDIR)/,$(TESTS))
44
export MAKE := $(MAKE) -e
55
export PATH := $(CURDIR):$(PATH)
6+
export TEST_LINT := test-lint-executable test-lint-shell-syntax
67

78
test:
89
$(MAKE) -C ../../t $@

contrib/remote-helpers/test-bzr.sh

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,6 @@ if ! "$PYTHON_PATH" -c 'import bzrlib'; then
1717
test_done
1818
fi
1919

20-
cmd='
21-
import bzrlib
22-
bzrlib.initialize()
23-
import bzrlib.plugin
24-
bzrlib.plugin.load_plugins()
25-
import bzrlib.plugins.fastimport
26-
'
27-
28-
if ! "$PYTHON_PATH" -c "$cmd"; then
29-
echo "consider setting BZR_PLUGIN_PATH=$HOME/.bazaar/plugins" 1>&2
30-
skip_all='skipping remote-bzr tests; bzr-fastimport not available'
31-
test_done
32-
fi
33-
3420
check () {
3521
(cd $1 &&
3622
git log --format='%s' -1 &&
@@ -136,7 +122,7 @@ test_expect_success 'special modes' '
136122
(cd gitrepo &&
137123
git cat-file -p HEAD:link > ../actual) &&
138124
139-
echo -n content > expected &&
125+
printf content > expected &&
140126
test_cmp expected actual
141127
'
142128

contrib/remote-helpers/test-hg-hg-git.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ test_expect_success 'executable bit' '
140140
git_clone_$x hgrepo-$x gitrepo2-$x &&
141141
git_log gitrepo2-$x > log-$x
142142
done &&
143-
cp -r log-* output-* /tmp/foo/ &&
144143
145144
test_cmp output-hg output-git &&
146145
test_cmp log-hg log-git

0 commit comments

Comments
 (0)