diff --git a/tests/bzr-definitions b/tests/bzr-definitions --- a/tests/bzr-definitions +++ b/tests/bzr-definitions @@ -2,7 +2,7 @@ "$TESTDIR/hghave" bzr || exit 80 -export TERM=dumb +TERM=dumb; export TERM echo '[extensions]' >> $HGRCPATH echo 'convert = ' >> $HGRCPATH echo 'hgext.graphlog = ' >> $HGRCPATH diff --git a/tests/test-convert-p4 b/tests/test-convert-p4 --- a/tests/test-convert-p4 +++ b/tests/test-convert-p4 @@ -6,12 +6,12 @@ echo "[extensions]" >> $HGRCPATH echo "convert = " >> $HGRCPATH echo % create p4 depot -export P4ROOT=$PWD/depot -export P4AUDIT=$P4ROOT/audit -export P4JOURNAL=$P4ROOT/journal -export P4LOG=$P4ROOT/log -export P4PORT=localhost:16661 -export P4DEBUG=1 +P4ROOT=$PWD/depot; export P4ROOT +P4AUDIT=$P4ROOT/audit; export P4AUDIT +P4JOURNAL=$P4ROOT/journal; export P4JOURNAL +P4LOG=$P4ROOT/log; export P4LOG +P4PORT=localhost:16661; export P4PORT +P4DEBUG=1; export P4DEBUG echo % start the p4 server [ ! -d $P4ROOT ] && mkdir $P4ROOT @@ -24,7 +24,7 @@ while ! p4 ; do done >/dev/null 2>/dev/null echo % create a client spec -export P4CLIENT=hg-p4-import +P4CLIENT=hg-p4-import; export P4CLIENT DEPOTPATH=//depot/test-mercurial-import/... p4 client -o | sed '/^View:/,$ d' >p4client echo View: >>p4client diff --git a/tests/test-convert-p4-filetypes b/tests/test-convert-p4-filetypes --- a/tests/test-convert-p4-filetypes +++ b/tests/test-convert-p4-filetypes @@ -6,13 +6,13 @@ echo "[extensions]" >> $HGRCPATH echo "convert = " >> $HGRCPATH echo % create p4 depot -export P4ROOT=$PWD/depot -export P4AUDIT=$P4ROOT/audit -export P4JOURNAL=$P4ROOT/journal -export P4LOG=$P4ROOT/log -export P4PORT=localhost:16661 -export P4DEBUG=1 -export P4CHARSET=utf8 +P4ROOT=$PWD/depot; export P4ROOT +P4AUDIT=$P4ROOT/audit; export P4AUDIT +P4JOURNAL=$P4ROOT/journal; export P4JOURNAL +P4LOG=$P4ROOT/log; export P4LOG +P4PORT=localhost:16661; export P4PORT +P4DEBUG=1; export P4DEBUG +P4CHARSET=utf8; export P4CHARSET echo % start the p4 server [ ! -d $P4ROOT ] && mkdir $P4ROOT @@ -26,7 +26,7 @@ while ! p4 ; do done >/dev/null 2>/dev/null echo % create a client spec -export P4CLIENT=hg-p4-import +P4CLIENT=hg-p4-import; export P4CLIENT DEPOTPATH=//depot/test-mercurial-import/... p4 client -o | sed '/^View:/,$ d' >p4client echo View: >>p4client