# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1284677492 18000
# Node ID 9cc90e2c826f1be4a27cfcb7268dc5a7ef0aa322
# Parent  b87861f5722250891d94ef40f37c83c25d6e82d2
tests: add exit codes to unified tests

[ original upstream message ]

diff -r b87861f57222 -r 9cc90e2c826f tests/run-tests.py
--- a/tests/run-tests.py	Sun Sep 12 18:05:53 2010 -0500
+++ b/tests/run-tests.py	Thu Sep 16 17:51:32 2010 -0500
@@ -474,7 +474,7 @@
             after.setdefault(pos, []).append(l)
             prepos = pos
             pos = n
-            script.append('echo %s %s\n' % (salt, n))
+            script.append('echo %s %s $?\n' % (salt, n))
             script.append(l[4:])
         elif l.startswith('  > '): # continuations
             after.setdefault(prepos, []).append(l)
@@ -486,6 +486,8 @@
             # non-command/result - queue up for merged output
             after.setdefault(pos, []).append(l)
 
+    script.append('echo %s %s $?\n' % (salt, n + 1))
+
     fd, name = tempfile.mkstemp(suffix='hg-tst')
 
     try:
@@ -508,8 +510,13 @@
 
     pos = -1
     postout = []
+    ret = 0
     for n, l in enumerate(output):
         if l.startswith(salt):
+            # add on last return code
+            ret = int(l.split()[2])
+            if ret != 0:
+                postout.append("  [%s]\n" % ret)
             if pos in after:
                 postout += after.pop(pos)
             pos = int(l.split()[1])
diff -r b87861f57222 -r 9cc90e2c826f tests/test-keyword.t
--- a/tests/test-keyword.t	Sun Sep 12 18:05:53 2010 -0500
+++ b/tests/test-keyword.t	Thu Sep 16 17:51:32 2010 -0500
@@ -116,6 +116,7 @@
 
   $ hg --debug commit
   abort: empty commit message
+  [255]
   $ hg status
   A a
   A b
@@ -540,6 +541,7 @@
 
   $ hg commit
   abort: empty commit message
+  [255]
   $ hg status
   M a
   ? c
@@ -689,6 +691,7 @@
 
   $ hg --verbose kwexpand x/a
   abort: outstanding uncommitted changes
+  [255]
   $ cd x
   $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
   x/a
@@ -818,6 +821,7 @@
   merging m failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  [1]
   $ cat m
   $Id$
   <<<<<<< local