Mercurial > hg

changeset 22292:102f0e926668

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: report skipped tests as "skipped" - they might still be "relevant"
author Mads Kiilerich <madski@unity3d.com>
date Tue, 26 Aug 2014 22:03:30 +0200
parents 3b39e1522d8f
children a970a5c15b43
files tests/run-tests.py tests/test-run-tests.t
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Sun Aug 24 12:35:53 2014 +0900
+++ b/tests/run-tests.py	Tue Aug 26 22:03:30 2014 +0200
@@ -546,7 +546,7 @@
                 missing, failed = TTest.parsehghaveoutput(out)
 
             if not missing:
-                missing = ['irrelevant']
+                missing = ['skipped']
 
             if failed:
                 self.fail('hg have failed checking for %s' % failed[-1])
--- a/tests/test-run-tests.t	Sun Aug 24 12:35:53 2014 +0900
+++ b/tests/test-run-tests.t	Tue Aug 26 22:03:30 2014 +0200
@@ -325,7 +325,7 @@
   > EOF
   $ $TESTDIR/run-tests.py --with-hg=`which hg` --nodiff
   !.s
-  Skipped test-skip.t: irrelevant
+  Skipped test-skip.t: skipped
   Failed test-failure.t: output changed
   # Ran 2 tests, 1 skipped, 0 warned, 1 failed.
   python hash seed: * (glob)
@@ -333,14 +333,14 @@
 
   $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy
   .s
-  Skipped test-skip.t: irrelevant
+  Skipped test-skip.t: skipped
   # Ran 2 tests, 2 skipped, 0 warned, 0 failed.
 
 Skips with xml
   $ $TESTDIR/run-tests.py --with-hg=`which hg` --keyword xyzzy \
   >  --xunit=xunit.xml
   .s
-  Skipped test-skip.t: irrelevant
+  Skipped test-skip.t: skipped
   # Ran 2 tests, 2 skipped, 0 warned, 0 failed.
   $ cat xunit.xml
   <?xml version="1.0" encoding="utf-8"?>