Patchwork [3,of,3,in,crew] run-tests: use correct python safely under --jobs

login
register
mail settings
Submitter Adrian Buehlmann
Date Dec. 11, 2012, 12:09 a.m.
Message ID <50C679C7.7010306@cadifra.com>
Download mbox | patch
Permalink /patch/48/
State Superseded
Commit 5522a7951bd7e2b16831ba1736feb2e9145d7e58
Headers show

Comments

Adrian Buehlmann - Dec. 11, 2012, 12:09 a.m.
On 2012-12-10 21:35, Bryan O'Sullivan wrote:
> # HG changeset patch
> # User Bryan O'Sullivan <bryano at fb.com>
> # Date 1355170495 28800
> # Node ID 5522a7951bd7e2b16831ba1736feb2e9145d7e58
> # Parent  07ad75b229109e6b2046fd5bd7adc346c964078f
> run-tests: use correct python safely under --jobs

This series seems to have broken most tests on Windows on the buildbot

http://hgbuildbot.kublai.com/builders/Windows%202008%20R2%20hg%20tests/builds/304


[..]

# Ran 335 tests, 119 skipped, 308 failed.
Bryan O'Sullivan - Dec. 11, 2012, 4:42 a.m.
On Mon, Dec 10, 2012 at 4:09 PM, Adrian Buehlmann <adrian at cadifra.com>wrote:

> This series seems to have broken most tests on Windows on the buildbot
>

Thanks, I'll take a look.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121210/1e50dc11/attachment.html>
Bryan O'Sullivan - Dec. 11, 2012, 9:53 p.m.
On Mon, Dec 10, 2012 at 8:42 PM, Bryan O'Sullivan <bos at serpentine.com>wrote:

> This series seems to have broken most tests on Windows on the buildbot
>>
>
> Thanks, I'll take a look.
>

I can't reproduce this problem on my Windows VM. Adrian, have you any
further idea what might be going on?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121211/0649758e/attachment.html>
Siddharth Agarwal - Dec. 12, 2012, 1:35 a.m.
On 12/11/2012 01:53 PM, Bryan O'Sullivan wrote:
> On Mon, Dec 10, 2012 at 8:42 PM, Bryan O'Sullivan <bos at serpentine.com 
> <mailto:bos at serpentine.com>> wrote:
>
>         This series seems to have broken most tests on Windows on the
>         buildbot
>
>
>     Thanks, I'll take a look.
>
>
> I can't reproduce this problem on my Windows VM. Adrian, have you any 
> further idea what might be going on?

Unfortunately it seems the trick of copying the python executable into 
the hg directory doesn't work on Windows, because Windows Python depends 
on other files in its own directory to work. Mads suggested we make sure 
os.path.join(dirname(sys.executable), "python.exe") existed, and then 
add that directory to the path.

Patch

--- c:\Users\buildbot\w2k8\Windows_2008_R2_hg_tests\build\tests\test-1102.t 
+++ c:\Users\buildbot\w2k8\Windows_2008_R2_hg_tests\build\tests\test-1102.t.err 
@@ -1,17 +1,7 @@ 
   $ rm -rf a
   $ hg init a
+  /usr/bin/env: python: Bad file number
+  [126]
   $ cd a
+  c:\tmp\tmpxh0utqhg-tst: line 7: cd: a: No such file or directory
   $ echo a > a
-  $ hg ci -Am0
-  adding a
-  $ hg tag t1 # 1
-  $ hg tag --remove t1 # 2
-
-  $ hg co 1
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg tag -f -r0 t1
-  $ hg tags
-  tip                                3:a49829c4fc11
-  t1                                 0:f7b1eb17ad24
-
-  $ cd ..