# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1339371651 -7200
# Node ID f2719b38738074324c2d2d81be481f05c7e431cb
# Parent  6ef3107c661e3c98f84816bf830af74680b75dcb
tests: add missing trailing 'cd ..'

Many tests didn't change back from subdirectories at the end of the tests ...
and they don't have to. The missing 'cd ..' could always be added when another
test case is added to the test file.

This change do that tests (99.5%) consistently end up in $TESTDIR where they
started, thus making it simpler to extend them or move them around.

diff --git a/tests/test-1102.t b/tests/test-1102.t
--- a/tests/test-1102.t
+++ b/tests/test-1102.t
@@ -14,3 +14,4 @@
   tip                                3:a49829c4fc11
   t1                                 0:f7b1eb17ad24
 
+  $ cd ..
diff --git a/tests/test-1993.t b/tests/test-1993.t
--- a/tests/test-1993.t
+++ b/tests/test-1993.t
@@ -44,3 +44,5 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Added tag default for changeset f7b1eb17ad24
   
+
+  $ cd ..
diff --git a/tests/test-586.t b/tests/test-586.t
--- a/tests/test-586.t
+++ b/tests/test-586.t
@@ -89,3 +89,4 @@
   src/b
   tst/a
 
+  $ cd ..
diff --git a/tests/test-abort-checkin.t b/tests/test-abort-checkin.t
--- a/tests/test-abort-checkin.t
+++ b/tests/test-abort-checkin.t
@@ -31,3 +31,5 @@
   rollback completed
   abort: no commits allowed
   [255]
+
+  $ cd ..
diff --git a/tests/test-add.t b/tests/test-add.t
--- a/tests/test-add.t
+++ b/tests/test-add.t
@@ -134,3 +134,4 @@
   A c
   ? a.orig
 
+  $ cd ..
diff --git a/tests/test-addremove-similar.t b/tests/test-addremove-similar.t
--- a/tests/test-addremove-similar.t
+++ b/tests/test-addremove-similar.t
@@ -98,3 +98,5 @@
   $ hg addremove -s80
   adding c
   recording removal of d/a as rename to c (100% similar) (glob)
+
+  $ cd ..
diff --git a/tests/test-annotate.t b/tests/test-annotate.t
--- a/tests/test-annotate.t
+++ b/tests/test-annotate.t
@@ -319,3 +319,4 @@
   1:  
   1: b  b
 
+  $ cd ..
diff --git a/tests/test-archive-symlinks.t b/tests/test-archive-symlinks.t
--- a/tests/test-archive-symlinks.t
+++ b/tests/test-archive-symlinks.t
@@ -36,3 +36,5 @@
   $ cd zip
   $ "$TESTDIR/readlink.py" dangling
   dangling -> nothing
+
+  $ cd ..
diff --git a/tests/test-archive.t b/tests/test-archive.t
--- a/tests/test-archive.t
+++ b/tests/test-archive.t
@@ -265,3 +265,5 @@
   *0*80*00:00*old/old (glob)
   *-----* (glob)
   \s*147\s+2 files (re)
+
+  $ cd ..
diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -88,3 +88,5 @@
   $ hg update -Cr4
   abort: *: $TESTTMP/target//tmp/test (glob)
   [255]
+
+  $ cd ..
diff --git a/tests/test-basic.t b/tests/test-basic.t
--- a/tests/test-basic.t
+++ b/tests/test-basic.t
@@ -53,3 +53,5 @@
   1 files, 1 changesets, 1 total revisions
 
 At the end...
+
+  $ cd ..
diff --git a/tests/test-bheads.t b/tests/test-bheads.t
--- a/tests/test-bheads.t
+++ b/tests/test-bheads.t
@@ -372,3 +372,4 @@
   $ hg merge -q 3
   $ hg ci -m "b12 (HH): merging two heads"
 
+  $ cd ..
diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -252,3 +252,5 @@
      foobar                    1:9b140be10808
 
   $ kill `cat ../hg.pid`
+
+  $ cd ..
diff --git a/tests/test-branch-tag-confict.t b/tests/test-branch-tag-confict.t
--- a/tests/test-branch-tag-confict.t
+++ b/tests/test-branch-tag-confict.t
@@ -61,3 +61,5 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Create a branch with the same name as a tag.
   
+
+  $ cd ..
diff --git a/tests/test-branches.t b/tests/test-branches.t
--- a/tests/test-branches.t
+++ b/tests/test-branches.t
@@ -408,3 +408,5 @@
   \x1b[0;34mc\x1b[0m \x1b[0;36m                            14:f894c25619d3\x1b[0m (closed) (esc)
   \x1b[0;35ma\x1b[0m \x1b[0;36m                             5:d8cbc61dbaa6\x1b[0m (inactive) (esc)
   \x1b[0;35mdefault\x1b[0m \x1b[0;36m                       0:19709c5a4e75\x1b[0m (inactive) (esc)
+
+  $ cd ..
diff --git a/tests/test-bundle-r.t b/tests/test-bundle-r.t
--- a/tests/test-bundle-r.t
+++ b/tests/test-bundle-r.t
@@ -324,3 +324,5 @@
   crosschecking files in changesets and manifests
   checking files
   4 files, 10 changesets, 7 total revisions
+
+  $ cd ..
diff --git a/tests/test-bundle-vs-outgoing.t b/tests/test-bundle-vs-outgoing.t
--- a/tests/test-bundle-vs-outgoing.t
+++ b/tests/test-bundle-vs-outgoing.t
@@ -142,3 +142,4 @@
   $ hg bundle --base 3 foo.bundle
   5 changesets found
 
+  $ cd ..
diff --git a/tests/test-bundle.t b/tests/test-bundle.t
--- a/tests/test-bundle.t
+++ b/tests/test-bundle.t
@@ -596,3 +596,5 @@
   crosschecking files in changesets and manifests
   checking files
   4 files, 3 changesets, 5 total revisions
+
+  $ cd ..
diff --git a/tests/test-changelog-exec.t b/tests/test-changelog-exec.t
--- a/tests/test-changelog-exec.t
+++ b/tests/test-changelog-exec.t
@@ -51,3 +51,5 @@
   $ hg debugindex bar
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       5      0       1 b004912a8510 000000000000 000000000000
+
+  $ cd ..
diff --git a/tests/test-children.t b/tests/test-children.t
--- a/tests/test-children.t
+++ b/tests/test-children.t
@@ -121,3 +121,5 @@
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     2
   
+
+  $ cd ..
diff --git a/tests/test-churn.t b/tests/test-churn.t
--- a/tests/test-churn.t
+++ b/tests/test-churn.t
@@ -158,3 +158,5 @@
   user4@x.com      2 *****************************
   user2            2 *****************************
   with space       1 **************
+
+  $ cd ..
diff --git a/tests/test-clone-pull-corruption.t b/tests/test-clone-pull-corruption.t
--- a/tests/test-clone-pull-corruption.t
+++ b/tests/test-clone-pull-corruption.t
@@ -50,3 +50,5 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 2 changesets, 2 total revisions
+
+  $ cd ..
diff --git a/tests/test-commit-multiple.t b/tests/test-commit-multiple.t
--- a/tests/test-commit-multiple.t
+++ b/tests/test-commit-multiple.t
@@ -129,3 +129,5 @@
   5  fix 2  bugfix file1
   6  x  bugfix file1
   7  y  file1
+
+  $ cd ..
diff --git a/tests/test-commit-unresolved.t b/tests/test-commit-unresolved.t
--- a/tests/test-commit-unresolved.t
+++ b/tests/test-commit-unresolved.t
@@ -45,3 +45,5 @@
 
   $ hg resolve -m A
   $ hg commit -m "Merged"
+
+  $ cd ..
diff --git a/tests/test-commit.t b/tests/test-commit.t
--- a/tests/test-commit.t
+++ b/tests/test-commit.t
@@ -303,3 +303,5 @@
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       6      0       0 26d3ca0dfd18 000000000000 000000000000
        1         6       7      1       1 d267bddd54f7 26d3ca0dfd18 000000000000
+
+  $ cd ..
diff --git a/tests/test-committer.t b/tests/test-committer.t
--- a/tests/test-committer.t
+++ b/tests/test-committer.t
@@ -61,3 +61,5 @@
   rollback completed
   abort: empty username!
   [255]
+
+  $ cd ..
diff --git a/tests/test-convert-bzr-ghosts.t b/tests/test-convert-bzr-ghosts.t
--- a/tests/test-convert-bzr-ghosts.t
+++ b/tests/test-convert-bzr-ghosts.t
@@ -34,3 +34,5 @@
   |
   o  0@source "Initial layout setup" files: somefile
   
+
+  $ cd ..
diff --git a/tests/test-convert-bzr-merges.t b/tests/test-convert-bzr-merges.t
--- a/tests/test-convert-bzr-merges.t
+++ b/tests/test-convert-bzr-merges.t
@@ -66,3 +66,5 @@
   644   file-branch1
   644   file-branch2
   644   file-parent
+
+  $ cd ..
diff --git a/tests/test-convert-bzr-treeroot.t b/tests/test-convert-bzr-treeroot.t
--- a/tests/test-convert-bzr-treeroot.t
+++ b/tests/test-convert-bzr-treeroot.t
@@ -31,3 +31,5 @@
   $ manifest source-hg tip
   % manifest of tip
   644   file
+
+  $ cd ..
diff --git a/tests/test-convert-cvs-branch.t b/tests/test-convert-cvs-branch.t
--- a/tests/test-convert-cvs-branch.t
+++ b/tests/test-convert-cvs-branch.t
@@ -190,3 +190,4 @@
   	b.txt:1.2->1.2.2.1 
   
 
+  $ cd ..
diff --git a/tests/test-convert-cvs.t b/tests/test-convert-cvs.t
--- a/tests/test-convert-cvs.t
+++ b/tests/test-convert-cvs.t
@@ -458,3 +458,4 @@
   	b/c:1.1.2.1->1.1.2.2 
   
 
+  $ cd ..
diff --git a/tests/test-convert-cvsnt-mergepoints.t b/tests/test-convert-cvsnt-mergepoints.t
--- a/tests/test-convert-cvsnt-mergepoints.t
+++ b/tests/test-convert-cvsnt-mergepoints.t
@@ -200,3 +200,5 @@
   Members: 
   	foo.txt:1.1.4.1->1.1.4.2 
   
+
+  $ cd ..
diff --git a/tests/test-convert-svn-move.t b/tests/test-convert-svn-move.t
--- a/tests/test-convert-svn-move.t
+++ b/tests/test-convert-svn-move.t
@@ -247,3 +247,5 @@
   1 branch
   0 clobberdir
   
+
+  $ cd ..
diff --git a/tests/test-convert-tagsbranch-topology.t b/tests/test-convert-tagsbranch-topology.t
--- a/tests/test-convert-tagsbranch-topology.t
+++ b/tests/test-convert-tagsbranch-topology.t
@@ -84,3 +84,5 @@
    /
   o  0 "rev1" files: a
   
+
+  $ cd ..
diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t
+++ b/tests/test-copy-move-merge.t
@@ -60,3 +60,5 @@
   0
   1
   2
+
+  $ cd ..
diff --git a/tests/test-copy.t b/tests/test-copy.t
--- a/tests/test-copy.t
+++ b/tests/test-copy.t
@@ -212,3 +212,5 @@
   $ hg st -AC foo
   M foo
     bar
+
+  $ cd ..
diff --git a/tests/test-debugbundle.t b/tests/test-debugbundle.t
--- a/tests/test-debugbundle.t
+++ b/tests/test-debugbundle.t
@@ -34,3 +34,4 @@
   c
   b80de5d138758541c5f05265ad144ab9fa86d1db 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 991a3460af53952d10ec8a295d3d2cc2e5fa9690 0000000000000000000000000000000000000000 12
 
+  $ cd ..
diff --git a/tests/test-debugindexdot.t b/tests/test-debugindexdot.t
--- a/tests/test-debugindexdot.t
+++ b/tests/test-debugindexdot.t
@@ -21,3 +21,5 @@
   	2 -> 3
   	1 -> 3
   }
+
+  $ cd ..
diff --git a/tests/test-diff-binary-file.t b/tests/test-diff-binary-file.t
--- a/tests/test-diff-binary-file.t
+++ b/tests/test-diff-binary-file.t
@@ -37,3 +37,4 @@
 
   $ hg diff --git -r 0 -r 2
 
+  $ cd ..
diff --git a/tests/test-diff-change.t b/tests/test-diff-change.t
--- a/tests/test-diff-change.t
+++ b/tests/test-diff-change.t
@@ -90,3 +90,4 @@
    9
    10
 
+  $ cd ..
diff --git a/tests/test-diff-color.t b/tests/test-diff-color.t
--- a/tests/test-diff-color.t
+++ b/tests/test-diff-color.t
@@ -126,3 +126,5 @@
   \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m  (esc)
 
 #endif
+
+  $ cd ..
diff --git a/tests/test-diff-hashes.t b/tests/test-diff-hashes.t
--- a/tests/test-diff-hashes.t
+++ b/tests/test-diff-hashes.t
@@ -43,3 +43,4 @@
   -bar
   +foobar
 
+  $ cd ..
diff --git a/tests/test-diff-subdir.t b/tests/test-diff-subdir.t
--- a/tests/test-diff-subdir.t
+++ b/tests/test-diff-subdir.t
@@ -44,3 +44,4 @@
   @@ -0,0 +1,1 @@
   +2
 
+  $ cd ..
diff --git a/tests/test-diffstat.t b/tests/test-diffstat.t
--- a/tests/test-diffstat.t
+++ b/tests/test-diffstat.t
@@ -69,3 +69,4 @@
    file with spaces |  Bin 
    1 files changed, 0 insertions(+), 0 deletions(-)
 	
+  $ cd ..
diff --git a/tests/test-double-merge.t b/tests/test-double-merge.t
--- a/tests/test-double-merge.t
+++ b/tests/test-double-merge.t
@@ -63,3 +63,5 @@
   line 0
   line 1
   line 2-2
+
+  $ cd ..
diff --git a/tests/test-empty-file.t b/tests/test-empty-file.t
--- a/tests/test-empty-file.t
+++ b/tests/test-empty-file.t
@@ -44,3 +44,4 @@
   b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty2
   b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty3
 
+  $ cd ..
diff --git a/tests/test-empty.t b/tests/test-empty.t
--- a/tests/test-empty.t
+++ b/tests/test-empty.t
@@ -51,3 +51,5 @@
 Should be empty:
 
   $ ls .hg/store
+
+  $ cd ..
diff --git a/tests/test-encode.t b/tests/test-encode.t
--- a/tests/test-encode.t
+++ b/tests/test-encode.t
@@ -59,3 +59,5 @@
   this is a test
   $ hg -R .. cat --decode ../a.gz | gunzip
   this is a test
+
+  $ cd ..
diff --git a/tests/test-encoding-align.t b/tests/test-encoding-align.t
--- a/tests/test-encoding-align.t
+++ b/tests/test-encoding-align.t
@@ -141,3 +141,5 @@
   \xe9\x95\xb7\xe3\x81\x84\xe9\x95\xb7\xe3\x81\x84\xe5\x90\x8d\xe5\x89\x8d                       4:9259be597f19 (esc)
   MIDDLE_                            3:b06c5b6def9e
   \xe7\x9f\xad\xe5\x90\x8d                               2:64a70663cee8 (esc)
+
+  $ cd ..
diff --git a/tests/test-encoding-textwrap.t b/tests/test-encoding-textwrap.t
--- a/tests/test-encoding-textwrap.t
+++ b/tests/test-encoding-textwrap.t
@@ -255,3 +255,5 @@
       \xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8 (esc)
   
   use "hg -v help show_ambig_ru" to show more info
+
+  $ cd ..
diff --git a/tests/test-encoding.t b/tests/test-encoding.t
--- a/tests/test-encoding.t
+++ b/tests/test-encoding.t
@@ -249,3 +249,4 @@
   $ HGENCODING=latin-1 hg up `cat latin-1-tag`
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  
+  $ cd ..
diff --git a/tests/test-eol-clone.t b/tests/test-eol-clone.t
--- a/tests/test-eol-clone.t
+++ b/tests/test-eol-clone.t
@@ -72,3 +72,5 @@
   first\r (esc)
   second\r (esc)
   third\r (esc)
+
+  $ cd ..
diff --git a/tests/test-eol-hook.t b/tests/test-eol-hook.t
--- a/tests/test-eol-hook.t
+++ b/tests/test-eol-hook.t
@@ -214,3 +214,5 @@
     d.txt in a7040e68714f should not have CRLF line endings
     b.txt in fbcf9b1025f5 should not have CRLF line endings
   [255]
+
+  $ cd ..
diff --git a/tests/test-eol-tag.t b/tests/test-eol-tag.t
--- a/tests/test-eol-tag.t
+++ b/tests/test-eol-tag.t
@@ -35,3 +35,5 @@
 Touch .hgtags file again:
 
   $ hg tag 2.0
+
+  $ cd ..
diff --git a/tests/test-eol.t b/tests/test-eol.t
--- a/tests/test-eol.t
+++ b/tests/test-eol.t
@@ -522,3 +522,4 @@
   fourth
   fifth
 
+  $ cd ..
diff --git a/tests/test-eolfilename.t b/tests/test-eolfilename.t
--- a/tests/test-eolfilename.t
+++ b/tests/test-eolfilename.t
@@ -68,3 +68,5 @@
   \x1b[0;35;1;4mbar\x1b[0m (esc)
   \x1b[0;35;1;4m? foo\x1b[0m (esc)
   \x1b[0;35;1;4mbar.baz\x1b[0m (esc)
+
+  $ cd ..
diff --git a/tests/test-export.t b/tests/test-export.t
--- a/tests/test-export.t
+++ b/tests/test-export.t
@@ -143,3 +143,5 @@
   $ hg export "not all()"
   abort: export requires at least one changeset
   [255]
+
+  $ cd ..
diff --git a/tests/test-fetch.t b/tests/test-fetch.t
--- a/tests/test-fetch.t
+++ b/tests/test-fetch.t
@@ -410,3 +410,5 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+
+  $ cd ..
diff --git a/tests/test-filebranch.t b/tests/test-filebranch.t
--- a/tests/test-filebranch.t
+++ b/tests/test-filebranch.t
@@ -146,3 +146,4 @@
   checking files
   4 files, 4 changesets, 10 total revisions
 
+  $ cd ..
diff --git a/tests/test-flags.t b/tests/test-flags.t
--- a/tests/test-flags.t
+++ b/tests/test-flags.t
@@ -147,3 +147,5 @@
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
        1         0       5      1       1 7fe919cc0336 b80de5d13875 000000000000
+
+  $ cd ..
diff --git a/tests/test-glog.t b/tests/test-glog.t
--- a/tests/test-glog.t
+++ b/tests/test-glog.t
@@ -2056,3 +2056,5 @@
   $ testlog --hidden
   []
   []
+
+  $ cd ..
diff --git a/tests/test-gpg.t b/tests/test-gpg.t
--- a/tests/test-gpg.t
+++ b/tests/test-gpg.t
@@ -30,3 +30,5 @@
 the main hg working dir
   $ "$TESTDIR/md5sum.py" "$TESTDIR/gpg/trustdb.gpg"
   f6b9c78c65fa9536e7512bb2ceb338ae  */gpg/trustdb.gpg (glob)
+
+  $ cd ..
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -287,3 +287,5 @@
   $ hg log --template '{rev} {parents} {desc}\n' -r tip
   14 1:5d205f8b35b6  3
   (grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8)
+
+  $ cd ..
diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -344,3 +344,4 @@
   $ cat ../b/.hg/localtags
   4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo
 
+  $ cd ..
diff --git a/tests/test-hgcia.t b/tests/test-hgcia.t
--- a/tests/test-hgcia.t
+++ b/tests/test-hgcia.t
@@ -90,3 +90,5 @@
     </body>
     <timestamp>0</timestamp>
   </message>
+
+  $ cd ..
diff --git a/tests/test-hgignore.t b/tests/test-hgignore.t
--- a/tests/test-hgignore.t
+++ b/tests/test-hgignore.t
@@ -122,3 +122,5 @@
 
   $ hg debugignore
   (?:(?:|.*/)[^/]*(?:/|$))
+
+  $ cd ..
diff --git a/tests/test-hgk.t b/tests/test-hgk.t
--- a/tests/test-hgk.t
+++ b/tests/test-hgk.t
@@ -16,3 +16,5 @@
   branch default
   
   adda
+
+  $ cd ..
diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
--- a/tests/test-hgweb-commands.t
+++ b/tests/test-hgweb-commands.t
@@ -1286,3 +1286,5 @@
 ERRORS ENCOUNTERED
 
   $ cat errors.log
+
+  $ cd ..
diff --git a/tests/test-hgweb-descend-empties.t b/tests/test-hgweb-descend-empties.t
--- a/tests/test-hgweb-descend-empties.t
+++ b/tests/test-hgweb-descend-empties.t
@@ -140,3 +140,5 @@
   
 
   $ cat errors.log
+
+  $ cd ..
diff --git a/tests/test-hgweb-diffs.t b/tests/test-hgweb-diffs.t
--- a/tests/test-hgweb-diffs.t
+++ b/tests/test-hgweb-diffs.t
@@ -598,3 +598,5 @@
 errors
 
   $ cat ../test/errors.log
+
+  $ cd ..
diff --git a/tests/test-hgweb-empty.t b/tests/test-hgweb-empty.t
--- a/tests/test-hgweb-empty.t
+++ b/tests/test-hgweb-empty.t
@@ -395,3 +395,5 @@
   </body>
   </html>
   
+
+  $ cd ..
diff --git a/tests/test-hgweb-filelog.t b/tests/test-hgweb-filelog.t
--- a/tests/test-hgweb-filelog.t
+++ b/tests/test-hgweb-filelog.t
@@ -755,3 +755,5 @@
 errors
 
   $ cat errors.log
+
+  $ cd ..
diff --git a/tests/test-hgweb-no-path-info.t b/tests/test-hgweb-no-path-info.t
--- a/tests/test-hgweb-no-path-info.t
+++ b/tests/test-hgweb-no-path-info.t
@@ -105,3 +105,5 @@
   
   ---- ERRORS
   
+
+  $ cd ..
diff --git a/tests/test-hgweb-no-request-uri.t b/tests/test-hgweb-no-request-uri.t
--- a/tests/test-hgweb-no-request-uri.t
+++ b/tests/test-hgweb-no-request-uri.t
@@ -139,3 +139,5 @@
   
   ---- ERRORS
   
+
+  $ cd ..
diff --git a/tests/test-hgweb-non-interactive.t b/tests/test-hgweb-non-interactive.t
--- a/tests/test-hgweb-non-interactive.t
+++ b/tests/test-hgweb-non-interactive.t
@@ -78,3 +78,5 @@
   []
   ---- request.ENVIRON wsgi variables
   ['wsgi.errors', 'wsgi.input', 'wsgi.multiprocess', 'wsgi.multithread', 'wsgi.run_once', 'wsgi.url_scheme', 'wsgi.version']
+
+  $ cd ..
diff --git a/tests/test-hgweb-raw.t b/tests/test-hgweb-raw.t
--- a/tests/test-hgweb-raw.t
+++ b/tests/test-hgweb-raw.t
@@ -56,3 +56,4 @@
   $ cat access.log error.log
   127.0.0.1 - - [*] "GET /?f=a23bf1310f6e;file=sub/some%20%22text%22.txt;style=raw HTTP/1.1" 200 - (glob)
 
+  $ cd ..
diff --git a/tests/test-hgweb-removed.t b/tests/test-hgweb-removed.t
--- a/tests/test-hgweb-removed.t
+++ b/tests/test-hgweb-removed.t
@@ -231,3 +231,5 @@
   </body>
   </html>
   
+
+  $ cd ..
diff --git a/tests/test-hgweb.t b/tests/test-hgweb.t
--- a/tests/test-hgweb.t
+++ b/tests/test-hgweb.t
@@ -443,3 +443,5 @@
 errors
 
   $ cat errors.log
+
+  $ cd ..
diff --git a/tests/test-highlight.t b/tests/test-highlight.t
--- a/tests/test-highlight.t
+++ b/tests/test-highlight.t
@@ -603,3 +603,5 @@
   % hgweb filerevision, html
   <div class="parity0 source"><a href="#l1" id="l1">     1</a> ??</div>
   % errors encountered
+
+  $ cd ..
diff --git a/tests/test-impexp-branch.t b/tests/test-impexp-branch.t
--- a/tests/test-impexp-branch.t
+++ b/tests/test-impexp-branch.t
@@ -69,3 +69,5 @@
   >>> file('../r1-ws.patch', 'wb').write(p)
   $ hg import --exact ../r1-ws.patch
   applying ../r1-ws.patch
+
+  $ cd ..
diff --git a/tests/test-import-bypass.t b/tests/test-import-bypass.t
--- a/tests/test-import-bypass.t
+++ b/tests/test-import-bypass.t
@@ -266,3 +266,5 @@
   o  0:a0e19e636a43 test 0 0 - default - t
   
 #endif
+
+  $ cd ..
diff --git a/tests/test-import-context.t b/tests/test-import-context.t
--- a/tests/test-import-context.t
+++ b/tests/test-import-context.t
@@ -123,3 +123,4 @@
   $ python ../cat.py d
   'A\nA\nA\nA\n'
 
+  $ cd ..
diff --git a/tests/test-import-merge.t b/tests/test-import-merge.t
--- a/tests/test-import-merge.t
+++ b/tests/test-import-merge.t
@@ -112,3 +112,4 @@
   3:102a90ea7b4a addb
   $ hg strip --no-backup tip
 
+  $ cd ..
diff --git a/tests/test-import-unknown.t b/tests/test-import-unknown.t
--- a/tests/test-import-unknown.t
+++ b/tests/test-import-unknown.t
@@ -65,3 +65,5 @@
   applying ../unknown.diff
   abort: cannot create copied: destination already exists
   [255]
+
+  $ cd ..
diff --git a/tests/test-inotify-dirty-dirstate.t b/tests/test-inotify-dirty-dirstate.t
--- a/tests/test-inotify-dirty-dirstate.t
+++ b/tests/test-inotify-dirty-dirstate.t
@@ -68,3 +68,5 @@
   $ hg status
   $ hg qrefresh
   $ hg status
+
+  $ cd ..
diff --git a/tests/test-inotify-issue1208.t b/tests/test-inotify-issue1208.t
--- a/tests/test-inotify-issue1208.t
+++ b/tests/test-inotify-issue1208.t
@@ -34,3 +34,5 @@
   abort: child process failed to start
   [255]
   $ kill `cat hg.pid`
+
+  $ cd ..
diff --git a/tests/test-inotify.t b/tests/test-inotify.t
--- a/tests/test-inotify.t
+++ b/tests/test-inotify.t
@@ -158,3 +158,5 @@
 
   $ hg st
   $ kill `cat hg.pid`
+
+  $ cd ..
diff --git a/tests/test-interhg.t b/tests/test-interhg.t
--- a/tests/test-interhg.t
+++ b/tests/test-interhg.t
@@ -29,3 +29,5 @@
 errors
 
   $ cat errors.log
+
+  $ cd ..
diff --git a/tests/test-issue1089.t b/tests/test-issue1089.t
--- a/tests/test-issue1089.t
+++ b/tests/test-issue1089.t
@@ -23,3 +23,4 @@
 
   $ hg ci -m m ../a
 
+  $ cd ..
diff --git a/tests/test-issue1802.t b/tests/test-issue1802.t
--- a/tests/test-issue1802.t
+++ b/tests/test-issue1802.t
@@ -69,3 +69,5 @@
   $ hg manifest -v
   755 * a
   644   b
+
+  $ cd ..
diff --git a/tests/test-issue1877.t b/tests/test-issue1877.t
--- a/tests/test-issue1877.t
+++ b/tests/test-issue1877.t
@@ -43,3 +43,4 @@
   $ hg book
      main                      2:d36c0562f908
 
+  $ cd ..
diff --git a/tests/test-issue2137.t b/tests/test-issue2137.t
--- a/tests/test-issue2137.t
+++ b/tests/test-issue2137.t
@@ -52,3 +52,5 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     one more commit to demonstrate the bug
   
+
+  $ cd ..
diff --git a/tests/test-issue3084.t b/tests/test-issue3084.t
--- a/tests/test-issue3084.t
+++ b/tests/test-issue3084.t
@@ -106,3 +106,5 @@
 
   $ cat foo
   large
+
+  $ cd ..
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -1127,3 +1127,5 @@
   $Xinfo$
   ignore $Id$
   a
+
+  $ cd ..
diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t
--- a/tests/test-largefiles-cache.t
+++ b/tests/test-largefiles-cache.t
@@ -119,3 +119,5 @@
 
   $ ../ls-l.py ../src/.hg/largefiles/b734e14a0971e370408ab9bce8d56d8485e368a9
   640
+
+  $ cd ..
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -268,3 +268,5 @@
   stuff/normal2
   $ [ -d .hg/largefiles ] && echo fail || echo pass
   pass
+
+  $ cd ..
diff --git a/tests/test-manifest-merging.t b/tests/test-manifest-merging.t
--- a/tests/test-manifest-merging.t
+++ b/tests/test-manifest-merging.t
@@ -34,3 +34,4 @@
   $ hg update --clean 1
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
+  $ cd ..
diff --git a/tests/test-merge-closedheads.t b/tests/test-merge-closedheads.t
--- a/tests/test-merge-closedheads.t
+++ b/tests/test-merge-closedheads.t
@@ -84,3 +84,4 @@
 hg commit (no reopening of some-branch)
   $ hgcommit -m 'merge with closed branch'
 
+  $ cd ..
diff --git a/tests/test-merge-commit.t b/tests/test-merge-commit.t
--- a/tests/test-merge-commit.t
+++ b/tests/test-merge-commit.t
@@ -181,3 +181,4 @@
        2       153       7      2       4 ff4b45017382 d35118874825 000000000000
        3       160      13      3       5 3701b4893544 ff4b45017382 5345f5ab8abd
 
+  $ cd ..
diff --git a/tests/test-merge-symlinks.t b/tests/test-merge-symlinks.t
--- a/tests/test-merge-symlinks.t
+++ b/tests/test-merge-symlinks.t
@@ -59,3 +59,5 @@
   HG_OTHER_ISLINK 0
   HG_BASE_ISLINK 0
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+
+  $ cd ..
diff --git a/tests/test-merge1.t b/tests/test-merge1.t
--- a/tests/test-merge1.t
+++ b/tests/test-merge1.t
@@ -172,3 +172,5 @@
   $ hg ci -md
   $ hg revert -r -2 b
   $ hg up -q -- -2
+
+  $ cd ..
diff --git a/tests/test-merge10.t b/tests/test-merge10.t
--- a/tests/test-merge10.t
+++ b/tests/test-merge10.t
@@ -49,3 +49,5 @@
   @@ -1,1 +1,1 @@
   -a
   +alpha
+
+  $ cd ..
diff --git a/tests/test-merge2.t b/tests/test-merge2.t
--- a/tests/test-merge2.t
+++ b/tests/test-merge2.t
@@ -49,3 +49,5 @@
   $ hg commit -A -m "commit #2"
   adding b
   created new head
+
+  $ cd ..
diff --git a/tests/test-merge6.t b/tests/test-merge6.t
--- a/tests/test-merge6.t
+++ b/tests/test-merge6.t
@@ -66,3 +66,5 @@
 bar should remain deleted.
   $ hg manifest --debug
   f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo
+
+  $ cd ..
diff --git a/tests/test-merge7.t b/tests/test-merge7.t
--- a/tests/test-merge7.t
+++ b/tests/test-merge7.t
@@ -143,3 +143,5 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Initial
   
+
+  $ cd ..
diff --git a/tests/test-merge8.t b/tests/test-merge8.t
--- a/tests/test-merge8.t
+++ b/tests/test-merge8.t
@@ -25,3 +25,5 @@
   (run 'hg update' to get a working copy)
   $ hg update
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
+  $ cd ..
diff --git a/tests/test-merge9.t b/tests/test-merge9.t
--- a/tests/test-merge9.t
+++ b/tests/test-merge9.t
@@ -90,3 +90,5 @@
   $ hg resolve -l
   U bar
   R baz
+
+  $ cd ..
diff --git a/tests/test-mq-caches.t b/tests/test-mq-caches.t
--- a/tests/test-mq-caches.t
+++ b/tests/test-mq-caches.t
@@ -122,3 +122,4 @@
   dc25e3827021582e979f600811852e36cbe57341 0
   dc25e3827021582e979f600811852e36cbe57341 foo
 
+  $ cd ..
diff --git a/tests/test-mq-header-from.t b/tests/test-mq-header-from.t
--- a/tests/test-mq-header-from.t
+++ b/tests/test-mq-header-from.t
@@ -967,3 +967,5 @@
   2: Three (again) - maria
   1: imported patch 2.patch - jane
   0: imported patch 1.patch - mary
+
+  $ cd ..
diff --git a/tests/test-mq-qdelete.t b/tests/test-mq-qdelete.t
--- a/tests/test-mq-qdelete.t
+++ b/tests/test-mq-qdelete.t
@@ -194,3 +194,4 @@
   revision 2b1c98802260 refers to unknown patches: 5.diff
   revision 33a6861311c0 refers to unknown patches: 4.diff
 
+  $ cd ..
diff --git a/tests/test-mq-qdiff.t b/tests/test-mq-qdiff.t
--- a/tests/test-mq-qdiff.t
+++ b/tests/test-mq-qdiff.t
@@ -173,3 +173,5 @@
   $ hg qrefresh
   $ rm newfile
   $ hg qdiff
+
+  $ cd ..
diff --git a/tests/test-mq-qgoto.t b/tests/test-mq-qgoto.t
--- a/tests/test-mq-qgoto.t
+++ b/tests/test-mq-qgoto.t
@@ -75,3 +75,4 @@
   abort: patch 14 not in series
   [255]
 
+  $ cd ..
diff --git a/tests/test-mq-qimport-fail-cleanup.t b/tests/test-mq-qimport-fail-cleanup.t
--- a/tests/test-mq-qimport-fail-cleanup.t
+++ b/tests/test-mq-qimport-fail-cleanup.t
@@ -38,3 +38,5 @@
   abort: revision 0 is not mutable
   (see "hg help phases" for details)
   [255]
+
+  $ cd ..
diff --git a/tests/test-mq-qimport.t b/tests/test-mq-qimport.t
--- a/tests/test-mq-qimport.t
+++ b/tests/test-mq-qimport.t
@@ -270,3 +270,5 @@
   $ hg qimport -r qparent
   $ hg phase qbase
   1: secret
+
+  $ cd ..
diff --git a/tests/test-mq-qpush-exact.t b/tests/test-mq-qpush-exact.t
--- a/tests/test-mq-qpush-exact.t
+++ b/tests/test-mq-qpush-exact.t
@@ -286,3 +286,4 @@
   abort: p0 does not have a parent recorded
   [255]
 
+  $ cd ..
diff --git a/tests/test-mq-qpush-fail.t b/tests/test-mq-qpush-fail.t
--- a/tests/test-mq-qpush-fail.t
+++ b/tests/test-mq-qpush-fail.t
@@ -422,3 +422,5 @@
   applying p2
   now at: p2
   $ hg st a
+
+  $ cd ..
diff --git a/tests/test-mq-qrefresh-interactive.t b/tests/test-mq-qrefresh-interactive.t
--- a/tests/test-mq-qrefresh-interactive.t
+++ b/tests/test-mq-qrefresh-interactive.t
@@ -346,3 +346,5 @@
 After qrefresh 'diff'
 
   $ hg diff --nodates
+
+  $ cd ..
diff --git a/tests/test-mq-qrefresh.t b/tests/test-mq-qrefresh.t
--- a/tests/test-mq-qrefresh.t
+++ b/tests/test-mq-qrefresh.t
@@ -543,3 +543,4 @@
   $ hg phase p2.diff
   2: secret
 
+  $ cd ..
diff --git a/tests/test-mq-safety.t b/tests/test-mq-safety.t
--- a/tests/test-mq-safety.t
+++ b/tests/test-mq-safety.t
@@ -212,3 +212,5 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+
+  $ cd ..
diff --git a/tests/test-mq-strip.t b/tests/test-mq-strip.t
--- a/tests/test-mq-strip.t
+++ b/tests/test-mq-strip.t
@@ -464,3 +464,5 @@
   $ hg id -ir 6:2702dd0c91e7
   abort: unknown revision '2702dd0c91e7'!
   [255]
+
+  $ cd ..
diff --git a/tests/test-mq-subrepo-svn.t b/tests/test-mq-subrepo-svn.t
--- a/tests/test-mq-subrepo-svn.t
+++ b/tests/test-mq-subrepo-svn.t
@@ -48,3 +48,5 @@
   $ hg qnew -m1 1.diff
   abort: uncommitted changes in subrepository sub
   [255]
+
+  $ cd ..
diff --git a/tests/test-mq-subrepo.t b/tests/test-mq-subrepo.t
--- a/tests/test-mq-subrepo.t
+++ b/tests/test-mq-subrepo.t
@@ -353,3 +353,5 @@
   $ echo sub = sub >> .hgsub
   $ hg add .hgsub
   $ hg qnew 0.diff
+
+  $ cd ..
diff --git a/tests/test-nested-repo.t b/tests/test-nested-repo.t
--- a/tests/test-nested-repo.t
+++ b/tests/test-nested-repo.t
@@ -38,3 +38,4 @@
   [255]
   $ hg st
 
+  $ cd ..
diff --git a/tests/test-newbranch.t b/tests/test-newbranch.t
--- a/tests/test-newbranch.t
+++ b/tests/test-newbranch.t
@@ -327,3 +327,4 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
+  $ cd ..
diff --git a/tests/test-parents.t b/tests/test-parents.t
--- a/tests/test-parents.t
+++ b/tests/test-parents.t
@@ -150,3 +150,5 @@
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     c2
   
+
+  $ cd ..
diff --git a/tests/test-parseindex.t b/tests/test-parseindex.t
--- a/tests/test-parseindex.t
+++ b/tests/test-parseindex.t
@@ -57,3 +57,5 @@
   2 revisions:
   7c31755bf9b5
   26333235a41c
+
+  $ cd ..
diff --git a/tests/test-patch-offset.t b/tests/test-patch-offset.t
--- a/tests/test-patch-offset.t
+++ b/tests/test-patch-offset.t
@@ -75,3 +75,5 @@
 
   $ python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A
   $ diff aref a
+
+  $ cd ..
diff --git a/tests/test-patchbomb.t b/tests/test-patchbomb.t
--- a/tests/test-patchbomb.t
+++ b/tests/test-patchbomb.t
@@ -2384,3 +2384,5 @@
   @@ -0,0 +1,1 @@
   +d
   
+
+  $ cd ..
diff --git a/tests/test-paths.t b/tests/test-paths.t
--- a/tests/test-paths.t
+++ b/tests/test-paths.t
@@ -62,3 +62,4 @@
   $ hg -q id
   000000000000
 
+  $ cd ..
diff --git a/tests/test-permissions.t b/tests/test-permissions.t
--- a/tests/test-permissions.t
+++ b/tests/test-permissions.t
@@ -69,3 +69,4 @@
 
   $ chmod +rx dir
 
+  $ cd ..
diff --git a/tests/test-phases.t b/tests/test-phases.t
--- a/tests/test-phases.t
+++ b/tests/test-phases.t
@@ -475,3 +475,5 @@
   cannot move 1 changesets to a more permissive phase, use --force
   no phases changed
   [1]
+
+  $ cd ..
diff --git a/tests/test-profile.t b/tests/test-profile.t
--- a/tests/test-profile.t
+++ b/tests/test-profile.t
@@ -27,3 +27,5 @@
   $ grep 'events: Ticks' ../out > /dev/null || cat ../out
 
 #endif
+
+  $ cd ..
diff --git a/tests/test-pull-branch.t b/tests/test-pull-branch.t
--- a/tests/test-pull-branch.t
+++ b/tests/test-pull-branch.t
@@ -212,3 +212,5 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+2 heads)
   (run 'hg heads .' to see heads, 'hg merge' to merge)
+
+  $ cd ..
diff --git a/tests/test-pull-http.t b/tests/test-pull-http.t
--- a/tests/test-pull-http.t
+++ b/tests/test-pull-http.t
@@ -61,3 +61,5 @@
   searching for changes
   abort: authorization failed
   % serve errors
+
+  $ cd ..
diff --git a/tests/test-pull-permission.t b/tests/test-pull-permission.t
--- a/tests/test-pull-permission.t
+++ b/tests/test-pull-permission.t
@@ -29,3 +29,4 @@
   checking files
   1 files, 1 changesets, 1 total revisions
 
+  $ cd ..
diff --git a/tests/test-pull-pull-corruption.t b/tests/test-pull-pull-corruption.t
--- a/tests/test-pull-pull-corruption.t
+++ b/tests/test-pull-pull-corruption.t
@@ -68,3 +68,5 @@
   crosschecking files in changesets and manifests
   checking files
   1 files, 11 changesets, 11 total revisions
+
+  $ cd ..
diff --git a/tests/test-pull-r.t b/tests/test-pull-r.t
--- a/tests/test-pull-r.t
+++ b/tests/test-pull-r.t
@@ -101,3 +101,4 @@
 
   $ hg pull -qr 1 ../repo
 
+  $ cd ..
diff --git a/tests/test-pull-update.t b/tests/test-pull-update.t
--- a/tests/test-pull-update.t
+++ b/tests/test-pull-update.t
@@ -59,3 +59,4 @@
   added 1 changesets with 1 changes to 1 files (-1 heads)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
+  $ cd ..
diff --git a/tests/test-pull.t b/tests/test-pull.t
--- a/tests/test-pull.t
+++ b/tests/test-pull.t
@@ -88,3 +88,5 @@
 
   $ URL=`python -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
   $ hg pull -q "$URL"
+
+  $ cd ..
diff --git a/tests/test-purge.t b/tests/test-purge.t
--- a/tests/test-purge.t
+++ b/tests/test-purge.t
@@ -214,3 +214,5 @@
   $ touch directory/.svn/foo
   $ hg purge -p -X .svn -X '*/.svn'
   $ hg purge -p -X re:.*.svn
+
+  $ cd ..
diff --git a/tests/test-push-cgi.t b/tests/test-push-cgi.t
--- a/tests/test-push-cgi.t
+++ b/tests/test-push-cgi.t
@@ -88,3 +88,5 @@
   adding manifests
   adding file changes
   added 0 changesets with 0 changes to 1 files
+
+  $ cd ..
diff --git a/tests/test-push-http.t b/tests/test-push-http.t
--- a/tests/test-push-http.t
+++ b/tests/test-push-http.t
@@ -119,3 +119,5 @@
   searching for changes
   abort: authorization failed
   % serve errors
+
+  $ cd ..
diff --git a/tests/test-push-r.t b/tests/test-push-r.t
--- a/tests/test-push-r.t
+++ b/tests/test-push-r.t
@@ -146,3 +146,4 @@
   checking files
   4 files, 9 changesets, 7 total revisions
 
+  $ cd ..
diff --git a/tests/test-push-validation.t b/tests/test-push-validation.t
--- a/tests/test-push-validation.t
+++ b/tests/test-push-validation.t
@@ -50,3 +50,4 @@
   abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify
   [255]
 
+  $ cd ..
diff --git a/tests/test-push-warn.t b/tests/test-push-warn.t
--- a/tests/test-push-warn.t
+++ b/tests/test-push-warn.t
@@ -727,3 +727,5 @@
   searching for changes
   no changes found
   [1]
+
+  $ cd ..
diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t
--- a/tests/test-qrecord.t
+++ b/tests/test-qrecord.t
@@ -398,3 +398,5 @@
 After qrecord b.patch 'diff'
 
   $ hg diff --nodates
+
+  $ cd ..
diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t
--- a/tests/test-rebase-abort.t
+++ b/tests/test-rebase-abort.t
@@ -154,3 +154,5 @@
   |/
   o  0:public 'A'
   
+
+  $ cd ..
diff --git a/tests/test-rebase-bookmarks.t b/tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@@ -86,3 +86,5 @@
   |
   o  0: 'A' bookmarks:
   
+
+  $ cd ..
diff --git a/tests/test-rebase-cache.t b/tests/test-rebase-cache.t
--- a/tests/test-rebase-cache.t
+++ b/tests/test-rebase-cache.t
@@ -262,3 +262,4 @@
   
   $ hg verify -q
 
+  $ cd ..
diff --git a/tests/test-rebase-check-restore.t b/tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t
+++ b/tests/test-rebase-check-restore.t
@@ -146,3 +146,5 @@
   |/
   o  0:draft 'A'
   
+
+  $ cd ..
diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -118,3 +118,4 @@
   $ hg cat -r 5 common
   resolved merge
 
+  $ cd ..
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -396,3 +396,5 @@
   |/
   o  0:draft 'A'
   
+
+  $ cd ..
diff --git a/tests/test-rebase-issue-noparam-single-rev.t b/tests/test-rebase-issue-noparam-single-rev.t
--- a/tests/test-rebase-issue-noparam-single-rev.t
+++ b/tests/test-rebase-issue-noparam-single-rev.t
@@ -124,3 +124,5 @@
   |
   o  0: 'c1'
   
+
+  $ cd ..
diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t
+++ b/tests/test-rebase-mq-skip.t
@@ -135,3 +135,5 @@
   |
   o  0: 'r0' tags:
   
+
+  $ cd ..
diff --git a/tests/test-rebase-newancestor.t b/tests/test-rebase-newancestor.t
--- a/tests/test-rebase-newancestor.t
+++ b/tests/test-rebase-newancestor.t
@@ -52,3 +52,5 @@
   |
   o  0: 'A'
   
+
+  $ cd ..
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -427,3 +427,4 @@
   tool option will be ignored
   saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob)
 
+  $ cd ..
diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t
--- a/tests/test-rebase-pull.t
+++ b/tests/test-rebase-pull.t
@@ -113,3 +113,4 @@
   o  2: 'R1'
   |
 
+  $ cd ..
diff --git a/tests/test-rebase-rename.t b/tests/test-rebase-rename.t
--- a/tests/test-rebase-rename.t
+++ b/tests/test-rebase-rename.t
@@ -168,3 +168,4 @@
    unrelated.txt |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
 
+  $ cd ..
diff --git a/tests/test-rebuildstate.t b/tests/test-rebuildstate.t
--- a/tests/test-rebuildstate.t
+++ b/tests/test-rebuildstate.t
@@ -27,3 +27,4 @@
   ? baz
   C foo
 
+  $ cd ..
diff --git a/tests/test-record.t b/tests/test-record.t
--- a/tests/test-record.t
+++ b/tests/test-record.t
@@ -1217,3 +1217,5 @@
    c
   +d
   
+
+  $ cd ..
diff --git a/tests/test-remove.t b/tests/test-remove.t
--- a/tests/test-remove.t
+++ b/tests/test-remove.t
@@ -264,3 +264,5 @@
   removing f1
   nothing changed
   [1]
+
+  $ cd ..
diff --git a/tests/test-rename-after-merge.t b/tests/test-rename-after-merge.t
--- a/tests/test-rename-after-merge.t
+++ b/tests/test-rename-after-merge.t
@@ -118,3 +118,4 @@
   $ hg log -r tip -C -v | grep copies
   copies:      b2 (b1)
 
+  $ cd ..
diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t
+++ b/tests/test-rename-dir-merge.t
@@ -155,3 +155,5 @@
     a/aa/g
   R a/aa/g
   R a/f
+
+  $ cd ..
diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t
+++ b/tests/test-rename-merge2.t
@@ -750,3 +750,5 @@
   M c
   --------------
   
+
+  $ cd ..
diff --git a/tests/test-repair-strip.t b/tests/test-repair-strip.t
--- a/tests/test-repair-strip.t
+++ b/tests/test-repair-strip.t
@@ -129,3 +129,4 @@
   checking files
   2 files, 2 changesets, 2 total revisions
 
+  $ cd ..
diff --git a/tests/test-requires.t b/tests/test-requires.t
--- a/tests/test-requires.t
+++ b/tests/test-requires.t
@@ -15,3 +15,5 @@
   $ hg tip
   abort: unknown repository format: requires features 'indoor-pool', 'outdoor-pool' (upgrade Mercurial)!
   [255]
+
+  $ cd ..
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -42,3 +42,5 @@
 resolve -l, should be empty
 
   $ hg resolve -l
+
+  $ cd ..
diff --git a/tests/test-revert-flags.t b/tests/test-revert-flags.t
--- a/tests/test-revert-flags.t
+++ b/tests/test-revert-flags.t
@@ -19,3 +19,5 @@
   diff --git a/foo b/foo
   old mode 100755
   new mode 100644
+
+  $ cd ..
diff --git a/tests/test-revert.t b/tests/test-revert.t
--- a/tests/test-revert.t
+++ b/tests/test-revert.t
@@ -274,3 +274,5 @@
 
   $ hg revert --no-backup ignored removed
   $ hg st -mardi
+
+  $ cd ..
diff --git a/tests/test-revlog-group-emptyiter.t b/tests/test-revlog-group-emptyiter.t
--- a/tests/test-revlog-group-emptyiter.t
+++ b/tests/test-revlog-group-emptyiter.t
@@ -32,3 +32,4 @@
   adding file changes
   added 1 changesets with 0 changes to 0 files (+1 heads)
 
+  $ cd ..
diff --git a/tests/test-revlog-packentry.t b/tests/test-revlog-packentry.t
--- a/tests/test-revlog-packentry.t
+++ b/tests/test-revlog-packentry.t
@@ -19,3 +19,5 @@
      rev    offset  length   base linkrev nodeid       p1           p2
        0         0       0      0       0 b80de5d13875 000000000000 000000000000
        1         0      24      0       1 0376abec49b8 000000000000 000000000000
+
+  $ cd ..
diff --git a/tests/test-revset-dirstate-parents.t b/tests/test-revset-dirstate-parents.t
--- a/tests/test-revset-dirstate-parents.t
+++ b/tests/test-revset-dirstate-parents.t
@@ -56,3 +56,5 @@
   $ log 'parents()'
   1
   2
+
+  $ cd ..
diff --git a/tests/test-revset-outgoing.t b/tests/test-revset-outgoing.t
--- a/tests/test-revset-outgoing.t
+++ b/tests/test-revset-outgoing.t
@@ -91,3 +91,4 @@
   $ hg tlog -r 'outgoing("green")'
   3:f0461977a3db: '4' 
 
+  $ cd ..
diff --git a/tests/test-rollback.t b/tests/test-rollback.t
--- a/tests/test-rollback.t
+++ b/tests/test-rollback.t
@@ -183,3 +183,5 @@
   rolling back unknown transaction
   $ cat a
   a
+
+  $ cd ..
diff --git a/tests/test-schemes.t b/tests/test-schemes.t
--- a/tests/test-schemes.t
+++ b/tests/test-schemes.t
@@ -46,3 +46,5 @@
 errors
 
   $ cat errors.log
+
+  $ cd ..
diff --git a/tests/test-serve.t b/tests/test-serve.t
--- a/tests/test-serve.t
+++ b/tests/test-serve.t
@@ -80,3 +80,5 @@
   $ hgserve --prefix /foo/
   listening at http://localhost/foo/ (bound to 127.0.0.1:HGPORT1)
   % errors
+
+  $ cd ..
diff --git a/tests/test-setdiscovery.t b/tests/test-setdiscovery.t
--- a/tests/test-setdiscovery.t
+++ b/tests/test-setdiscovery.t
@@ -324,3 +324,4 @@
   5 total queries
   common heads: 3ee37d65064a
 
+  $ cd ..
diff --git a/tests/test-share.t b/tests/test-share.t
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -125,3 +125,5 @@
   $ cd ../repo1
   $ hg id -r tip
   c2e0ac586386 tip
+
+  $ cd ..
diff --git a/tests/test-simple-update.t b/tests/test-simple-update.t
--- a/tests/test-simple-update.t
+++ b/tests/test-simple-update.t
@@ -54,3 +54,5 @@
   $ hg upd -d foo 0
   abort: you can't specify a revision and a date
   [255]
+
+  $ cd ..
diff --git a/tests/test-ssh-clone-r.t b/tests/test-ssh-clone-r.t
--- a/tests/test-ssh-clone-r.t
+++ b/tests/test-ssh-clone-r.t
@@ -191,3 +191,5 @@
   crosschecking files in changesets and manifests
   checking files
   4 files, 9 changesets, 7 total revisions
+
+  $ cd ..
diff --git a/tests/test-status-color.t b/tests/test-status-color.t
--- a/tests/test-status-color.t
+++ b/tests/test-status-color.t
@@ -296,3 +296,5 @@
   $ hg resolve --color=always -l
   \x1b[0;31;1mU a\x1b[0m (esc)
   \x1b[0;32;1mR b\x1b[0m (esc)
+
+  $ cd ..
diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -512,3 +512,5 @@
   $ hg forget 'notafile*'
   notafile*: No such file or directory
   [1]
+
+  $ cd ..
diff --git a/tests/test-subrepo-missing.t b/tests/test-subrepo-missing.t
--- a/tests/test-subrepo-missing.t
+++ b/tests/test-subrepo-missing.t
@@ -67,3 +67,5 @@
   $ hg st
   $ ls subrepo
   a
+
+  $ cd ..
diff --git a/tests/test-subrepo-paths.t b/tests/test-subrepo-paths.t
--- a/tests/test-subrepo-paths.t
+++ b/tests/test-subrepo-paths.t
@@ -57,3 +57,5 @@
   $ hg debugsub
   abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)
   [255]
+
+  $ cd ..
diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t
+++ b/tests/test-subrepo-recursion.t
@@ -490,3 +490,5 @@
   $ hg add .hgsub
   $ touch a x/a
   $ hg add a x/a
+
+  $ cd ..
diff --git a/tests/test-symlink-placeholder.t b/tests/test-symlink-placeholder.t
--- a/tests/test-symlink-placeholder.t
+++ b/tests/test-symlink-placeholder.t
@@ -68,3 +68,5 @@
   $ hg manifest tip --verbose
   644   a
   644 @ b
+
+  $ cd ..
diff --git a/tests/test-symlinks.t b/tests/test-symlinks.t
--- a/tests/test-symlinks.t
+++ b/tests/test-symlinks.t
@@ -253,3 +253,4 @@
   $ mv dirlink newdir/dirlink
   $ hg mv -A dirlink newdir/dirlink
 
+  $ cd ..
diff --git a/tests/test-tags.t b/tests/test-tags.t
--- a/tests/test-tags.t
+++ b/tests/test-tags.t
@@ -380,3 +380,5 @@
   tip                                1:a0b6fe111088
   localtag                           0:bbd179dfa0a7 local
   globaltag                          0:bbd179dfa0a7
+
+  $ cd ..
diff --git a/tests/test-template-engine.t b/tests/test-template-engine.t
--- a/tests/test-template-engine.t
+++ b/tests/test-template-engine.t
@@ -35,3 +35,5 @@
   adding mymap
   $ hg log --style=./mymap
   0 97e5f848f0936960273bbf75be6388cd0350a32b test
+
+  $ cd ..
diff --git a/tests/test-unrelated-pull.t b/tests/test-unrelated-pull.t
--- a/tests/test-unrelated-pull.t
+++ b/tests/test-unrelated-pull.t
@@ -41,3 +41,5 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
+
+  $ cd ..
diff --git a/tests/test-up-local-change.t b/tests/test-up-local-change.t
--- a/tests/test-up-local-change.t
+++ b/tests/test-up-local-change.t
@@ -234,3 +234,5 @@
   added 1 changesets with 1 changes to 1 files
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
+
+  $ cd ..
diff --git a/tests/test-update-issue1456.t b/tests/test-update-issue1456.t
--- a/tests/test-update-issue1456.t
+++ b/tests/test-update-issue1456.t
@@ -33,3 +33,4 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
 
+  $ cd ..
diff --git a/tests/test-url-rev.t b/tests/test-url-rev.t
--- a/tests/test-url-rev.t
+++ b/tests/test-url-rev.t
@@ -206,3 +206,5 @@
   $ hg id http://foo/?bar
   abort: unsupported URL component: "bar"
   [255]
+
+  $ cd ..
diff --git a/tests/test-walk.t b/tests/test-walk.t
--- a/tests/test-walk.t
+++ b/tests/test-walk.t
@@ -318,3 +318,5 @@
   f  mammals/skunk  ../t/mammals/skunk  exact
   $ hg debugwalk --cwd ../t mammals/skunk
   f  mammals/skunk  mammals/skunk  exact
+
+  $ cd ..
diff --git a/tests/test-win32text.t b/tests/test-win32text.t
--- a/tests/test-win32text.t
+++ b/tests/test-win32text.t
@@ -422,3 +422,5 @@
   $ hg st -q
   $ cat linefeed
   % just linefeed\r (esc)
+
+  $ cd ..