# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-09-26 19:36:49
# Node ID b6a784e39ad453f8e91cffd1b3f7afecc30edfac
# Parent  c40b4744071a3ead3df1942d1a5b92e28180d705

tests: unify test-convert-bzr-ghosts

diff --git a/tests/test-convert-bzr-ghosts.out b/tests/test-convert-bzr-ghosts.out
deleted file mode 100644
--- a/tests/test-convert-bzr-ghosts.out
+++ /dev/null
@@ -1,11 +0,0 @@
-% ghost revisions
-initializing destination source-hg repository
-scanning source...
-sorting...
-converting...
-1 Initial layout setup
-0 Commit with ghost revision
-o  1 "Commit with ghost revision" files: somefile
-|
-o  0 "Initial layout setup" files: somefile
-
diff --git a/tests/test-convert-bzr-ghosts b/tests/test-convert-bzr-ghosts.t
old mode 100755
new mode 100644
rename from tests/test-convert-bzr-ghosts
rename to tests/test-convert-bzr-ghosts.t
--- a/tests/test-convert-bzr-ghosts
+++ b/tests/test-convert-bzr-ghosts.t
@@ -1,27 +1,36 @@
-#!/bin/sh
-
-. "$TESTDIR/bzr-definitions"
 
-cat > ghostcreator.py <<EOF
-import sys
-from bzrlib import workingtree
-wt = workingtree.WorkingTree.open('.')
+  $ . "$TESTDIR/bzr-definitions"
+  $ cat > ghostcreator.py <<EOF
+  > import sys
+  > from bzrlib import workingtree
+  > wt = workingtree.WorkingTree.open('.')
+  > 
+  > message, ghostrev = sys.argv[1:]
+  > wt.set_parent_ids(wt.get_parent_ids() + [ghostrev])
+  > wt.commit(message)
+  > EOF
 
-message, ghostrev = sys.argv[1:]
-wt.set_parent_ids(wt.get_parent_ids() + [ghostrev])
-wt.commit(message)
-EOF
+ghost revisions
 
-echo % ghost revisions
-mkdir test-ghost-revisions
-cd test-ghost-revisions
-bzr init -q source
-cd source
-echo content > somefile
-bzr add -q somefile
-bzr commit -q -m 'Initial layout setup'
-echo morecontent >> somefile
-python ../../ghostcreator.py 'Commit with ghost revision' ghostrev
-cd ..
-hg convert source source-hg
-glog -R source-hg
+  $ mkdir test-ghost-revisions
+  $ cd test-ghost-revisions
+  $ bzr init -q source
+  $ cd source
+  $ echo content > somefile
+  $ bzr add -q somefile
+  $ bzr commit -q -m 'Initial layout setup'
+  $ echo morecontent >> somefile
+  $ python ../../ghostcreator.py 'Commit with ghost revision' ghostrev
+  $ cd ..
+  $ hg convert source source-hg
+  initializing destination source-hg repository
+  scanning source...
+  sorting...
+  converting...
+  1 Initial layout setup
+  0 Commit with ghost revision
+  $ glog -R source-hg
+  o  1 "Commit with ghost revision" files: somefile
+  |
+  o  0 "Initial layout setup" files: somefile
+