[PATCH 3 of 3] run-tests: redefine --with-hg so it takes the 'hg' script to run

[Martin Geisler]

Greg Ward <greg-hg at gerg.ca> writes:

Hi Greg,

Thanks for looking at this again. The first two patches worked fine, but
this third patch causes problems.

> # HG changeset patch
> # User Greg Ward <greg-hg at gerg.ca>
> # Date 1243518129 14400
> # Node ID ac22ab94f333f3cdae7c553b541a2ca16d1ee20e
> # Parent  503caf96f8381c89ecffab0272dbd96b17e9f499
> run-tests: redefine --with-hg so it takes the 'hg' script to run.

When I apply this patch I get errors when running

  ./run-tests.py -v -j 2

This is what I see -- I've wrapped long lines (handing indent) and
deleted many succesful copying "foo -> bar" lines. It works when I use a
single job; I have not yet tried with the --with-hg option.

% ./run-tests.py -v -j 2
# Found prerequisite python at /usr/bin/python
# Found prerequisite diff at /usr/bin/diff
# Found prerequisite grep at /bin/grep
# Found prerequisite unzip at /usr/bin/unzip
# Found prerequisite gunzip at /bin/gunzip
# Found prerequisite bunzip2 at /bin/bunzip2
# Found prerequisite sed at /bin/sed
# Using TESTDIR /home/mg/src/mercurial-crew/tests
# Using HGTMP /tmp/hgtests.qSx2KT
# Using PATH /tmp/hgtests.qSx2KT/install/bin:/home/mg/bin:
  /home/mg/opt/bin:/home/mg/opt/games:/usr/local/bin:/usr/bin:/bin:
  /usr/bin/X11:/usr/games
# Using PYTHONPATH /tmp/hgtests.qSx2KT/install/lib/python
# Performing temporary installation of HG
# Running /usr/bin/python setup.py clean --all install --force
  --prefix="/tmp/hgtests.qSx2KT/install"
  --install-lib="/tmp/hgtests.qSx2KT/install/lib/python"
  --install-scripts="/tmp/hgtests.qSx2KT/install/bin" >tests/install.err
  2>&1
# Installing dummy diffstat
/usr/bin/python ./run-tests.py --jobs=1 --verbose --port=20059
  --timeout=180 --child=4 --port=20059 test-1102 test-abort-checkin
  # many tests...
/usr/bin/python ./run-tests.py --jobs=1 --verbose --port=20059
  --timeout=180 --child=5 --port=20062 test-586 test-acl
  # many tests...
# Using TESTDIR /home/mg/src/mercurial-crew/tests
# Using HGTMP /tmp/hgtests.umc3Hw
# Using PATH /tmp/hgtests.umc3Hw/install/bin:
  /tmp/hgtests.qSx2KT/install/bin:/home/mg/bin:/home/mg/opt/bin:
  /home/mg/opt/games:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:
  /usr/games
# Using PYTHONPATH /tmp/hgtests.umc3Hw/install/lib/python
# Performing temporary installation of HG
# Running /usr/bin/python setup.py clean --all install --force
  --prefix="/tmp/hgtests.umc3Hw/install"
  --install-lib="/tmp/hgtests.umc3Hw/install/lib/python"
  --install-scripts="/tmp/hgtests.umc3Hw/install/bin" >tests/install.err
  2>&1
# Using TESTDIR /home/mg/src/mercurial-crew/tests
# Using HGTMP /tmp/hgtests.OJmZaP
# Using PATH /tmp/hgtests.OJmZaP/install/bin:
  /tmp/hgtests.qSx2KT/install/bin:/home/mg/bin:/home/mg/opt/bin:
  /home/mg/opt/games:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:
  /usr/games
# Using PYTHONPATH /tmp/hgtests.OJmZaP/install/lib/python
# Performing temporary installation of HG
# Running /usr/bin/python setup.py clean --all install --force
  --prefix="/tmp/hgtests.OJmZaP/install"
  --install-lib="/tmp/hgtests.OJmZaP/install/lib/python"
  --install-scripts="/tmp/hgtests.OJmZaP/install/bin" >tests/install.err
  2>&1
running clean
removing 'build/lib.linux-i686-2.5' (and everything under it)
error removing build/lib.linux-i686-2.5:
  build/lib.linux-i686-2.5/mercurial:Directory not empty
error removing build/lib.linux-i686-2.5:build/lib.linux-i686-2.5:
  Directory not empty
'build/bdist.linux-i686' does not exist -- can't clean it
'build/scripts-2.5' does not exist -- can't clean it
running install
running build
running build_py
copying mercurial/i18n.py -> build/lib.linux-i686-2.5/mercurial
# copying many files...
copying mercurial/ui.py -> build/lib.linux-i686-2.5/mercurial
creating build/lib.linux-i686-2.5/hgext/convert
error:could not create 'build/lib.linux-i686-2.5/hgext/convert':File exists
opying mercurial/commands.py -> build/lib.linux-i686-2.5/mercurial
# copying many files...
copying hgext/inotify/linux/__init__.py -> build/lib.linux-i686-2.5/hgext/inotify/linux
running build_ext
# Cleaning up HGTMP /tmp/hgtests.umc3Hw
# Cleaning up HGTMP /tmp/hgtests.qSx2KT
Traceback (most recent call last):
  File "./run-tests.py", line 746, in <module>
    main()
  File "./run-tests.py", line 740, in main
    runchildren(options, tests)
  File "./run-tests.py", line 565, in runchildren
    test, skip, fail = map(int, l[:3])
ValueError: need more than 0 values to unpack


-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20090529/02100ec2/attachment.pgp