--- a/tests/test-check-code-hg.t Sat Feb 09 15:36:00 2013 +0000
+++ b/tests/test-check-code-hg.t Sat Feb 09 15:59:44 2013 +0000
@@ -1,6 +1,6 @@
$ check_code="$TESTDIR"/../contrib/check-code.py
$ cd "$TESTDIR"/..
- $ if hg identify -q > /dev/null; then :
+ $ if hg identify -q > /dev/null 2>&1; then :
> else
> echo "skipped: not a Mercurial working dir" >&2
> exit 80
@@ -8,12 +8,6 @@
New errors are not allowed. Warnings are strongly discouraged.
- $ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 \
- > || false
- tests/test-serve.t:0:
- > > kill `cat hg.pid`
- don't use kill, use killdaemons.py
- tests/test-serve.t:0:
- > > kill `cat hg.pid` 2>/dev/null
- don't use kill, use killdaemons.py
- [1]
+ $ hg manifest 2>/dev/null \
+ > | xargs "$check_code" --warnings --nolineno --per-file=0 \
+ > || false
--- a/tests/test-serve.t Sat Feb 09 15:36:00 2013 +0000
+++ b/tests/test-serve.t Sat Feb 09 15:59:44 2013 +0000
@@ -9,12 +9,7 @@
> cat hg.pid >> "$DAEMON_PIDS"
> echo % errors
> cat errors.log
- > if [ "$KILLQUIETLY" = "Y" ]; then
- > kill `cat hg.pid` 2>/dev/null
- > else
- > kill `cat hg.pid`
- > fi
- > while kill -0 `cat hg.pid` 2>/dev/null; do sleep 0; done
+ > "$TESTDIR/killdaemons.py" hg.pid
> }
$ hg init test