Commit Graph

72 Commits

Author SHA1 Message Date
Matt Mackall
0edb7d6fe4 run-tests: allow turning off diff display 2008-11-07 16:28:52 -06:00
Matt Mackall
3c69f4c760 run-tests: --interactive overrides -j 2008-10-22 17:34:37 -05:00
Thomas Arendsen Hein
d6b1ca4cb9 Use dummy diffstat in tests and remove older diffstat workaround.
This makes test-notify pass on systems without diffstat installed
or where the diffstat version yields a different output.
2008-10-19 19:03:23 +02:00
Benoit Boissinot
624e32832b run-tests.py: report missing file as an error 2008-10-18 22:44:01 +02:00
Benoit Boissinot
44d89759ff run-tests.py: use --prefix instead of --home
Some SUSE version don't like --home, they fail with:
"error: must supply either home or prefix/exec-prefix -- not both"

this is due to SUSE shipping a distutils.cfg conflicting with --home.
2008-10-18 21:08:44 +02:00
Benoit Boissinot
1dcbb85da7 run-tests.py: fix the check for the hg installation with -jn (n > 1) 2008-09-10 13:52:33 +02:00
Dirkjan Ochtman
8c471ba704 imported patch test-check 2008-09-03 19:01:35 +02:00
Thomas Arendsen Hein
6fbdf04649 run-tests.py: Make tests run with python2.3 if HGTEST_* is set.
optparse of python2.3 does not transform default values to the specified
type so e.g. "HGTEST_JOBS=4" (introduced in b8e8d6b0ae08) causes tests
to abort, because options.jobs is set to '4' instead of the number 4.
2008-06-16 11:37:26 +02:00
Thomas Arendsen Hein
818fb02fb9 run-tests.py: Only one fail message when output changed and error code.
This fixes passing back fail messages mistaken for skip messages when
running with parallel jobs because run_children() only expects one message per
fail.
2008-03-24 22:09:01 +01:00
Thomas Arendsen Hein
702b9172d1 run-tests.py: Allow environment variables to set jobs/timeout/port. 2008-03-23 21:48:38 +01:00
Matt Mackall
f9e70fb40e tests: teach -i about fails list 2008-03-21 15:57:22 -05:00
Benoit Boissinot
3a35d838ed run-tests.py: add a summary of failed tests at the end 2008-03-13 17:39:30 +01:00
Joel Rosdahl
4f8012378a Remove unused imports 2008-03-06 22:23:41 +01:00
Thomas Arendsen Hein
9ff01ae3fe Replaced tab in run-tests.py 2008-03-07 00:01:13 +01:00
Peter Arrenbrecht
85ef77aca1 tests: add --keep-tmp to run-tests.py to debug test environment
When set, you can find the working dir of the test run as a
uniquely named subdirectory of --tmpdir so you can inspect
it.
2008-03-05 08:00:05 +01:00
Matt Mackall
9d996cd13f merge: allow smarter tool configuration
Add [merge-tool] hgrc section with:
 <tool>.executable = name or path (<tool>)
 <tool>.args = args with $local/base/other/output ($local $base $other)
 <tool>.priority = priority (default 0)
 <tool>.binary = handles binary (False)
 <tool>.symlink = handles symlinks (False)
 <tool>.checkconflict = check for conflict markers (False)
 <tool>.premerge = try internal simplemerge (True if not binary or symlink)

Four built-in tools: internal:{merge,local,other,fail}

Add [merge-patterns] section of the form:
 <pattern> = <tool>

Priority of settings is:
 HGMERGE
 merge-patterns
 ui:merge
 merge-tools by priority
 hgmerge, if it can be found

Changes:
 unsuccessful merges leave .orig files
2008-02-03 19:29:05 -06:00
Patrick Mezard
336268093f Merge with crew-stable 2008-01-05 22:52:28 +01:00
Patrick Mezard
47378bdecc Make run-tests.py --interactive work on Windows 2008-01-05 17:55:16 +01:00
Thomas Arendsen Hein
1566cda979 Don't let ui.username override web.contact (issue900)
63beab327d26 introduced using ui.username before web.contact, but this was
never documented and might cause commit accidents.

- Drop web.author (deprecated since 2005)
- Try ui.username or $EMAIL as a fallback to display something useful.
- Update docs for the fallbacks.
2008-01-01 17:07:15 +01:00
Thomas Arendsen Hein
347da85c36 Removed tabs and trailing whitespace in python files 2007-12-29 19:49:48 +01:00
Thomas Arendsen Hein
cb74375be7 Use skipped: instead of hghave: for skipping tests, use this in test-merge-types 2007-12-21 21:50:19 +01:00
Alexis S. L. Carvalho
9877d9e85e run-tests.py: add a default --date "0 0" argument to commit et al
Part of test-tags was modified just to be sure this works.

The change in test-archive-symlinks is necessary to avoid a "helpful"
warning from GNU tar ("implausibly old time stamp 1970-01-01 00:00:00").
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
8dd3103fe5 run-tests.py: don't print a dot for skipped tests 2007-11-09 20:21:35 -02:00
Matt Mackall
c9db98f2e6 tests: tidy up reporting of skipped tests
if not verbose:
 - print 's' rather than '.'
 - pass skipped test reports back to parent for -j
 - report which tests were skipped at the end

- print '.' after test completion
2007-10-19 12:53:43 -05:00
Bryan O'Sullivan
f5b570e3a6 run-tests.py: allow a different temporary directory to be specified 2007-10-05 12:42:52 -07:00
Bryan O'Sullivan
a03fea73e0 Allow tests to run in parallel. 2007-10-05 12:17:01 -07:00
Bryan O'Sullivan
b1622da091 run-tests.py: reorder options alphabetically. 2007-10-05 09:30:02 -07:00
Brendan Cully
2a5ee3fd3f Include . in PYTHONPATH (makes testing unbundled extensions easier) 2007-08-29 17:01:10 -07:00
Brendan Cully
f81247179c Make run-tests.py work when invoked outside of tests.
This makes it usable for unbundled extensions.
2007-08-29 16:50:21 -07:00
Patrick Mezard
6acdd7ff15 run-tests: append PYTHONPATH instead of overwriting it
Optional dependencies like svn bindings not necessarily live in site-packages.
2007-08-27 22:17:51 +02:00
Alexis S. L. Carvalho
de2d9c54e8 run-tests.py: pass --install-scripts to setup.py
This avoids possible problems when the user has a ~/.pydistutils.cfg.
Fixes issue638.  Patch provided by Ralf Schmitt.
2007-08-17 22:43:38 -03:00
Thomas Arendsen Hein
001b7980f8 Remove trailing spaces 2007-08-07 10:24:33 +02:00
Thomas Arendsen Hein
82531f29f5 Add message to test output if a test is aborted due to a timeout.
Without this an aborted test could produce an empty .err file so the diff
looks like as if all lines of the .out files are just missing for some unknown
reason.
2007-08-06 14:45:43 +02:00
Patrick Mezard
a17aa86e69 Add hghave utility and run-tests.py support.
hghave detects system features like symlinks availability at run-time. Tests can be skipped by starting them with:

"$TESTDIR/hghave" symlink || exit 80

The 80 exit status triggers hghave output handling by run-tests.py. Also, tests output can be locally patched on the fly to match reference output.
2007-07-14 18:34:06 +02:00
Patrick Mezard
4e0f588756 run-tests: extract correct status when script terminates with exit 2007-07-14 14:01:11 +02:00
Thomas Arendsen Hein
483231d996 Cleanup of whitespace, indentation and line continuation. 2007-06-19 08:06:37 +02:00
Alexis S. L. Carvalho
2f82b4ffa3 run-tests.py: set ui.slash = True
This should make things easier for pysh.
2007-06-08 23:49:12 -03:00
Alexis S. L. Carvalho
274bce0c1c run-tests.py: pass -L/--label to simplemerge
This should give us conflict markers that don't change from one run
to another.

Remove some sed's/egrep's from some tests.
2007-04-28 17:55:45 -03:00
Alexis S. L. Carvalho
a4fb0722ca change tests to use simplemerge by default 2007-04-16 20:17:39 -03:00
Alexis S. L. Carvalho
31232bf5ab run-tests.py: use coverage.py with "#!/usr/bin/env python" tests 2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
63574c7e40 run-tests.py: small cleanup 2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
5dd065da79 run-tests.py: use coverage.py with *.py tests 2007-04-07 04:27:55 -03:00
Alexis S. L. Carvalho
77c152a933 run-tests.py: tell coverage.py to ignore errors
Otherwise there'll be some IOErrors when it tries to open python
files created during the execution of e.g. test-hook.
2007-04-07 04:27:55 -03:00
Matt Mackall
ab12bf1889 tests: set a default encoding for running tests (ASCII) 2006-12-03 16:16:33 -06:00
Matt Mackall
6b93d4c0fd tests: add -i switch
Prompt to accept changes for tests where output changed
2006-11-08 13:20:08 -06:00
Matt Mackall
4dc56ee619 tests: add -R switch
Restarts at first .err file if one exists, otherwise runs all tests
2006-11-08 13:20:08 -06:00
Matt Mackall
a6ea08deb0 tests: sort test list if running all tests 2006-11-08 13:20:08 -06:00
Matt Mackall
6feb12faa2 run-tests: add --first switch to exit on first error 2006-10-09 23:08:41 -05:00
Matt Mackall
a11adc1f86 run-tests: add --retest switch
-r reruns tests for which a .err file exists
2006-10-09 23:05:11 -05:00
Thomas Arendsen Hein
0a7b982aa6 Whitespace/Tab cleanup 2006-10-01 19:26:33 +02:00