# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-09-26 19:37:47
# Node ID cc8f1083e8beaf648dfba977d870d83bc4b4b938
# Parent  90efbd1a2a5635d77ff08f32204d273e045c6da9

tests: unify test-convert-bzr-treeroot

diff --git a/tests/test-convert-bzr-treeroot.out b/tests/test-convert-bzr-treeroot.out
deleted file mode 100644
--- a/tests/test-convert-bzr-treeroot.out
+++ /dev/null
@@ -1,9 +0,0 @@
-% change the id of the tree root
-initializing destination source-hg repository
-scanning source...
-sorting...
-converting...
-1 Initial add
-0 Changed root
-% manifest of tip
-644   file
diff --git a/tests/test-convert-bzr-treeroot b/tests/test-convert-bzr-treeroot.t
old mode 100755
new mode 100644
rename from tests/test-convert-bzr-treeroot
rename to tests/test-convert-bzr-treeroot.t
--- a/tests/test-convert-bzr-treeroot
+++ b/tests/test-convert-bzr-treeroot.t
@@ -1,26 +1,33 @@
-#!/bin/sh
-
-. "$TESTDIR/bzr-definitions"
 
-cat > treeset.py <<EOF
-import sys
-from bzrlib import workingtree
-wt = workingtree.WorkingTree.open('.')
+  $ . "$TESTDIR/bzr-definitions"
+  $ cat > treeset.py <<EOF
+  > import sys
+  > from bzrlib import workingtree
+  > wt = workingtree.WorkingTree.open('.')
+  > 
+  > message, rootid = sys.argv[1:]
+  > wt.set_root_id('tree_root-%s' % rootid)
+  > wt.commit(message)
+  > EOF
+
+change the id of the tree root
 
-message, rootid = sys.argv[1:]
-wt.set_root_id('tree_root-%s' % rootid)
-wt.commit(message)
-EOF
-
-echo % change the id of the tree root
-mkdir test-change-treeroot-id
-cd test-change-treeroot-id
-bzr init -q source
-cd source
-echo content > file
-bzr add -q file
-bzr commit -q -m 'Initial add'
-python ../../treeset.py 'Changed root' new
-cd ..
-hg convert source source-hg
-manifest source-hg tip
+  $ mkdir test-change-treeroot-id
+  $ cd test-change-treeroot-id
+  $ bzr init -q source
+  $ cd source
+  $ echo content > file
+  $ bzr add -q file
+  $ bzr commit -q -m 'Initial add'
+  $ python ../../treeset.py 'Changed root' new
+  $ cd ..
+  $ hg convert source source-hg
+  initializing destination source-hg repository
+  scanning source...
+  sorting...
+  converting...
+  1 Initial add
+  0 Changed root
+  $ manifest source-hg tip
+  % manifest of tip
+  644   file