# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-09-26 19:35:43
# Node ID d1f88ae495b411d36ee388c73856d7c720ec0b81
# Parent  8d84166d34d776131d8a43a5d1ea896def6cc0c6

tests: unify test-convert-bzr-114

diff --git a/tests/test-convert-bzr-114.out b/tests/test-convert-bzr-114.out
deleted file mode 100644
--- a/tests/test-convert-bzr-114.out
+++ /dev/null
@@ -1,11 +0,0 @@
-% replace file with dir
-initializing destination source-hg repository
-scanning source...
-sorting...
-converting...
-2 add d file
-1 replace with d dir
-0 add d/a
-% manifest of tip
-644   d/a
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-convert-bzr-114 b/tests/test-convert-bzr-114.t
old mode 100755
new mode 100644
rename from tests/test-convert-bzr-114
rename to tests/test-convert-bzr-114.t
--- a/tests/test-convert-bzr-114
+++ b/tests/test-convert-bzr-114.t
@@ -1,30 +1,39 @@
-#!/bin/sh
+
+  $ "$TESTDIR/hghave" bzr114 || exit 80
+  $ . "$TESTDIR/bzr-definitions"
 
-"$TESTDIR/hghave" bzr114 || exit 80
-
-. "$TESTDIR/bzr-definitions"
+The file/directory replacement can only be reproduced on
+bzr >= 1.4. Merge it back in test-convert-bzr-directories once
+this version becomes mainstream.
+replace file with dir
 
-# The file/directory replacement can only be reproduced on
-# bzr >= 1.4. Merge it back in test-convert-bzr-directories once
-# this version becomes mainstream.
-echo % replace file with dir
-mkdir test-replace-file-with-dir
-cd test-replace-file-with-dir
-bzr init -q source
-cd source
-echo d > d
-bzr add -q d
-bzr commit -q -m 'add d file'
-rm d
-mkdir d
-bzr add -q d
-bzr commit -q -m 'replace with d dir'
-echo a > d/a
-bzr add -q d/a
-bzr commit -q -m 'add d/a'
-cd ..
-hg convert source source-hg
-manifest source-hg tip
-cd source-hg
-hg update
-cd ../..
+  $ mkdir test-replace-file-with-dir
+  $ cd test-replace-file-with-dir
+  $ bzr init -q source
+  $ cd source
+  $ echo d > d
+  $ bzr add -q d
+  $ bzr commit -q -m 'add d file'
+  $ rm d
+  $ mkdir d
+  $ bzr add -q d
+  $ bzr commit -q -m 'replace with d dir'
+  $ echo a > d/a
+  $ bzr add -q d/a
+  $ bzr commit -q -m 'add d/a'
+  $ cd ..
+  $ hg convert source source-hg
+  initializing destination source-hg repository
+  scanning source...
+  sorting...
+  converting...
+  2 add d file
+  1 replace with d dir
+  0 add d/a
+  $ manifest source-hg tip
+  % manifest of tip
+  644   d/a
+  $ cd source-hg
+  $ hg update
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd ../..