# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1286623616 -3600
# Node ID 908e4fe6c1771f4842d84aad6292aa30323767a3
# Parent  8f2c2cc51789ddb3b5f8f5eac176552fb6e5f343# Parent  6d3f8caef3b31a2e7fc334bc99f2590aadda1055
Merge with stable

diff -r 8f2c2cc51789 -r 908e4fe6c177 tests/run-tests.py
--- a/tests/run-tests.py	Sat Oct 09 11:35:31 2010 +0100
+++ b/tests/run-tests.py	Sat Oct 09 12:26:56 2010 +0100
@@ -362,10 +362,11 @@
         # when they happen.
         nohome = ''
     cmd = ('%s setup.py %s clean --all'
+           ' build --build-base="%s"'
            ' install --force --prefix="%s" --install-lib="%s"'
            ' --install-scripts="%s" %s >%s 2>&1'
-           % (sys.executable, pure, INST, PYTHONDIR, BINDIR, nohome,
-              installerrs))
+           % (sys.executable, pure, os.path.join(HGTMP, "build"),
+              INST, PYTHONDIR, BINDIR, nohome, installerrs))
     vlog("# Running", cmd)
     if os.system(cmd) == 0:
         if not options.verbose:
@@ -486,6 +487,8 @@
             # non-command/result - queue up for merged output
             after.setdefault(pos, []).append(l)
 
+    if script and not script[-1].endswith('\n'):
+        script[-1] = script[-1] + '\n'
     script.append('echo %s %s $?\n' % (salt, n + 1))
 
     fd, name = tempfile.mkstemp(suffix='hg-tst')
@@ -498,6 +501,9 @@
         cmd = '/bin/sh "%s"' % name
         vlog("# Running", cmd)
         exitcode, output = run(cmd, options)
+        # do not merge output if skipped, return hghave message instead
+        if exitcode == SKIPPED_STATUS:
+            return exitcode, output
     finally:
         os.remove(name)
 
diff -r 8f2c2cc51789 -r 908e4fe6c177 tests/test-keyword.t
--- a/tests/test-keyword.t	Sat Oct 09 11:35:31 2010 +0100
+++ b/tests/test-keyword.t	Sat Oct 09 12:26:56 2010 +0100
@@ -535,7 +535,7 @@
 
   $ cp sym i
   $ ls -l i
-  -rw-r--r--  * (glob)
+  -rw-r--r-- * (glob)
   $ head -1 i
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   $ hg copy --after --verbose sym i