# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-09-26 18:43:21
# Node ID b98d931482e679e56496792a9f7b8eca26493771
# Parent  f727db60abb41a21df018fa4b3a10dc182787048

tests: unify test-inotify-issue1208

diff --git a/tests/test-inotify-issue1208.out b/tests/test-inotify-issue1208.out
deleted file mode 100644
--- a/tests/test-inotify-issue1208.out
+++ /dev/null
@@ -1,7 +0,0 @@
-% fail
-abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
-inotify-client: could not start inotify server: child process failed to start
-abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
-% inserve
-% status
-? hg.pid
diff --git a/tests/test-inotify-issue1208 b/tests/test-inotify-issue1208.t
old mode 100755
new mode 100644
rename from tests/test-inotify-issue1208
rename to tests/test-inotify-issue1208.t
--- a/tests/test-inotify-issue1208
+++ b/tests/test-inotify-issue1208.t
@@ -1,24 +1,29 @@
-#!/bin/sh
-
-"$TESTDIR/hghave" inotify || exit 80
 
-echo "[extensions]" >> $HGRCPATH
-echo "inotify=" >> $HGRCPATH
+  $ "$TESTDIR/hghave" inotify || exit 80
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "inotify=" >> $HGRCPATH
+  $ p="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+  $ hg init $p
+  $ cd $p
 
-p="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-hg init $p
-cd $p
+fail
 
-echo % fail
-ln -sf doesnotexist .hg/inotify.sock
-hg st
-hg inserve
-rm .hg/inotify.sock
+  $ ln -sf doesnotexist .hg/inotify.sock
+  $ hg st
+  abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
+  inotify-client: could not start inotify server: child process failed to start
+  $ hg inserve
+  abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
+  [255]
+  $ rm .hg/inotify.sock
 
-echo % inserve
-hg inserve -d --pid-file=hg.pid
-cat hg.pid >> "$DAEMON_PIDS"
-echo % status
-hg status
+inserve
+
+  $ hg inserve -d --pid-file=hg.pid
+  $ cat hg.pid >> "$DAEMON_PIDS"
 
-kill `cat hg.pid`
+status
+
+  $ hg status
+  ? hg.pid
+  $ kill `cat hg.pid`