tests: unify test-eolfilename

2024-10-06 23:07:18 +03:00 · 2010-09-26 13:41:32 -05:00 · 2010-09-26 13:41:32 -05:00 · 17dbdccf9a
commit 17dbdccf9a
parent c0b56d138a
3 changed files with 57 additions and 63 deletions
--- a/tests/test-eolfilename
+++ b/tests/test-eolfilename
@ -1,43 +0,0 @@
-#!/bin/sh
-# http://mercurial.selenic.com/bts/issue352
-
-"$TESTDIR/hghave" eol-in-paths || exit 80
-
-echo % test issue352
-hg init foo
-cd foo
-
-A=`printf 'he\rllo'`
-
-echo foo > "$A"
-hg add
-hg ci -A -m m
-rm "$A"
-
-echo foo > "hell
-o"
-hg add
-hg ci -A -m m
-
-echo foo > "$A"
-hg debugwalk
-
-# http://mercurial.selenic.com/bts/issue2036
-cd ..
-echo % test issue2039
-
-hg init bar
-cd bar
-
-echo "[extensions]" >> $HGRCPATH
-echo "color=" >> $HGRCPATH
-
-A=`printf 'foo\nbar'`
-B=`printf 'foo\nbar.baz'`
-
-touch "$A"
-touch "$B"
-
-hg status --color=always
-
-exit 0
--- a/tests/test-eolfilename.out
+++ b/tests/test-eolfilename.out
@ -1,20 +0,0 @@
-% test issue352
-adding he
llo
-abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
-adding he
llo
-abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
-adding hell
-o
-abort: '\n' and '\r' disallowed in filenames: 'hell\no'
-adding hell
-o
-abort: '\n' and '\r' disallowed in filenames: 'hell\no'
-f  he
llo  he
llo
-f  hell
-o  hell
-o
-% test issue2039
-[0;35;1;4m? foo[0m
-[0;35;1;4mbar[0m
-[0;35;1;4m? foo[0m
-[0;35;1;4mbar.baz[0m
--- a/tests/test-eolfilename.t
+++ b/tests/test-eolfilename.t
@ -0,0 +1,57 @@
+http://mercurial.selenic.com/bts/issue352
+
+  $ "$TESTDIR/hghave" eol-in-paths || exit 80
+
+test issue352
+
+  $ hg init foo
+  $ cd foo
+  $ A=`printf 'he\rllo'`
+  $ echo foo > "$A"
+  $ hg add
+  adding he
llo
+  abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
+  [255]
+  $ hg ci -A -m m
+  adding he
llo
+  abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
+  [255]
+  $ rm "$A"
+  $ echo foo > "hell
+  > o"
+  $ hg add
+  adding hell
+  o
+  abort: '\n' and '\r' disallowed in filenames: 'hell\no'
+  [255]
+  $ hg ci -A -m m
+  adding hell
+  o
+  abort: '\n' and '\r' disallowed in filenames: 'hell\no'
+  [255]
+  $ echo foo > "$A"
+  $ hg debugwalk
+  f  he
llo  he
llo
+  f  hell
+  o  hell
+  o
+
+http://mercurial.selenic.com/bts/issue2036
+
+  $ cd ..
+
+test issue2039
+
+  $ hg init bar
+  $ cd bar
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "color=" >> $HGRCPATH
+  $ A=`printf 'foo\nbar'`
+  $ B=`printf 'foo\nbar.baz'`
+  $ touch "$A"
+  $ touch "$B"
+  $ hg status --color=always
+  [0;35;1;4m? foo[0m
+  [0;35;1;4mbar[0m
+  [0;35;1;4m? foo[0m
+  [0;35;1;4mbar.baz[0m