Show More
@@ -1248,7 +1248,7 class TTest(Test): | |||||
1248 | super(TTest, self).__init__(path, *args, **kwds) |
|
1248 | super(TTest, self).__init__(path, *args, **kwds) | |
1249 | if case: |
|
1249 | if case: | |
1250 | self.name = '%s#%s' % (self.name, _strpath(case)) |
|
1250 | self.name = '%s#%s' % (self.name, _strpath(case)) | |
1251 |
self.errpath = b'%s |
|
1251 | self.errpath = b'%s#%s.err' % (self.errpath[:-4], case) | |
1252 | self._tmpname += b'-%s' % case |
|
1252 | self._tmpname += b'-%s' % case | |
1253 | self._have = {} |
|
1253 | self._have = {} | |
1254 |
|
1254 | |||
@@ -2713,7 +2713,7 class TestRunner(object): | |||||
2713 | desc = testdescs[0] |
|
2713 | desc = testdescs[0] | |
2714 | # desc['path'] is a relative path |
|
2714 | # desc['path'] is a relative path | |
2715 | if 'case' in desc: |
|
2715 | if 'case' in desc: | |
2716 |
errpath = b'%s |
|
2716 | errpath = b'%s#%s.err' % (desc['path'], desc['case']) | |
2717 | else: |
|
2717 | else: | |
2718 | errpath = b'%s.err' % desc['path'] |
|
2718 | errpath = b'%s.err' % desc['path'] | |
2719 | errpath = os.path.join(self._outputdir, errpath) |
|
2719 | errpath = os.path.join(self._outputdir, errpath) |
@@ -850,7 +850,7 When "#testcases" is used in .t files | |||||
850 | > EOF |
|
850 | > EOF | |
851 |
|
851 | |||
852 | --- $TESTTMP/test-cases.t |
|
852 | --- $TESTTMP/test-cases.t | |
853 |
+++ $TESTTMP/test-cases.t |
|
853 | +++ $TESTTMP/test-cases.t#a.err | |
854 | @@ -1,6 +1,7 @@ |
|
854 | @@ -1,6 +1,7 @@ | |
855 | #testcases a b |
|
855 | #testcases a b | |
856 | #if a |
|
856 | #if a | |
@@ -861,7 +861,7 When "#testcases" is used in .t files | |||||
861 | $ echo 2 |
|
861 | $ echo 2 | |
862 | Accept this change? [n] . |
|
862 | Accept this change? [n] . | |
863 | --- $TESTTMP/test-cases.t |
|
863 | --- $TESTTMP/test-cases.t | |
864 |
+++ $TESTTMP/test-cases.t |
|
864 | +++ $TESTTMP/test-cases.t#b.err | |
865 | @@ -5,4 +5,5 @@ |
|
865 | @@ -5,4 +5,5 @@ | |
866 | #endif |
|
866 | #endif | |
867 | #if b |
|
867 | #if b | |
@@ -1540,7 +1540,7 Test cases in .t files | |||||
1540 | $ rt |
|
1540 | $ rt | |
1541 | . |
|
1541 | . | |
1542 | --- $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1542 | --- $TESTTMP/anothertests/cases/test-cases-abc.t | |
1543 |
+++ $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1543 | +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err | |
1544 | @@ -7,7 +7,7 @@ |
|
1544 | @@ -7,7 +7,7 @@ | |
1545 | $ V=C |
|
1545 | $ V=C | |
1546 | #endif |
|
1546 | #endif | |
@@ -1563,7 +1563,7 Test cases in .t files | |||||
1563 | $ rt --restart |
|
1563 | $ rt --restart | |
1564 |
|
1564 | |||
1565 | --- $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1565 | --- $TESTTMP/anothertests/cases/test-cases-abc.t | |
1566 |
+++ $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1566 | +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err | |
1567 | @@ -7,7 +7,7 @@ |
|
1567 | @@ -7,7 +7,7 @@ | |
1568 | $ V=C |
|
1568 | $ V=C | |
1569 | #endif |
|
1569 | #endif | |
@@ -1584,11 +1584,11 Test cases in .t files | |||||
1584 | --restart works with outputdir |
|
1584 | --restart works with outputdir | |
1585 |
|
1585 | |||
1586 | $ mkdir output |
|
1586 | $ mkdir output | |
1587 |
$ mv test-cases-abc.t |
|
1587 | $ mv test-cases-abc.t#B.err output | |
1588 | $ rt --restart --outputdir output |
|
1588 | $ rt --restart --outputdir output | |
1589 |
|
1589 | |||
1590 | --- $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1590 | --- $TESTTMP/anothertests/cases/test-cases-abc.t | |
1591 |
+++ $TESTTMP/anothertests/cases/output/test-cases-abc.t |
|
1591 | +++ $TESTTMP/anothertests/cases/output/test-cases-abc.t#B.err | |
1592 | @@ -7,7 +7,7 @@ |
|
1592 | @@ -7,7 +7,7 @@ | |
1593 | $ V=C |
|
1593 | $ V=C | |
1594 | #endif |
|
1594 | #endif | |
@@ -1631,7 +1631,7 Support running a specific test case | |||||
1631 | $ rt "test-cases-abc.t#B" |
|
1631 | $ rt "test-cases-abc.t#B" | |
1632 |
|
1632 | |||
1633 | --- $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1633 | --- $TESTTMP/anothertests/cases/test-cases-abc.t | |
1634 |
+++ $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1634 | +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err | |
1635 | @@ -7,7 +7,7 @@ |
|
1635 | @@ -7,7 +7,7 @@ | |
1636 | $ V=C |
|
1636 | $ V=C | |
1637 | #endif |
|
1637 | #endif | |
@@ -1654,7 +1654,7 Support running multiple test cases in t | |||||
1654 | $ rt test-cases-abc.t#B test-cases-abc.t#C |
|
1654 | $ rt test-cases-abc.t#B test-cases-abc.t#C | |
1655 |
|
1655 | |||
1656 | --- $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1656 | --- $TESTTMP/anothertests/cases/test-cases-abc.t | |
1657 |
+++ $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1657 | +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err | |
1658 | @@ -7,7 +7,7 @@ |
|
1658 | @@ -7,7 +7,7 @@ | |
1659 | $ V=C |
|
1659 | $ V=C | |
1660 | #endif |
|
1660 | #endif | |
@@ -1677,7 +1677,7 Support ignoring invalid test cases | |||||
1677 | $ rt test-cases-abc.t#B test-cases-abc.t#D |
|
1677 | $ rt test-cases-abc.t#B test-cases-abc.t#D | |
1678 |
|
1678 | |||
1679 | --- $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1679 | --- $TESTTMP/anothertests/cases/test-cases-abc.t | |
1680 |
+++ $TESTTMP/anothertests/cases/test-cases-abc.t |
|
1680 | +++ $TESTTMP/anothertests/cases/test-cases-abc.t#B.err | |
1681 | @@ -7,7 +7,7 @@ |
|
1681 | @@ -7,7 +7,7 @@ | |
1682 | $ V=C |
|
1682 | $ V=C | |
1683 | #endif |
|
1683 | #endif | |
@@ -1711,7 +1711,7 Support running complex test cases names | |||||
1711 | $ rt test-cases-advanced-cases.t |
|
1711 | $ rt test-cases-advanced-cases.t | |
1712 |
|
1712 | |||
1713 | --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t |
|
1713 | --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t | |
1714 |
+++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t |
|
1714 | +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#case-with-dashes.err | |
1715 | @@ -1,3 +1,3 @@ |
|
1715 | @@ -1,3 +1,3 @@ | |
1716 | #testcases simple case-with-dashes casewith_-.chars |
|
1716 | #testcases simple case-with-dashes casewith_-.chars | |
1717 | $ echo $TESTCASE |
|
1717 | $ echo $TESTCASE | |
@@ -1721,7 +1721,7 Support running complex test cases names | |||||
1721 | ERROR: test-cases-advanced-cases.t#case-with-dashes output changed |
|
1721 | ERROR: test-cases-advanced-cases.t#case-with-dashes output changed | |
1722 | ! |
|
1722 | ! | |
1723 | --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t |
|
1723 | --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t | |
1724 |
+++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t |
|
1724 | +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#casewith_-.chars.err | |
1725 | @@ -1,3 +1,3 @@ |
|
1725 | @@ -1,3 +1,3 @@ | |
1726 | #testcases simple case-with-dashes casewith_-.chars |
|
1726 | #testcases simple case-with-dashes casewith_-.chars | |
1727 | $ echo $TESTCASE |
|
1727 | $ echo $TESTCASE | |
@@ -1739,7 +1739,7 Support running complex test cases names | |||||
1739 | $ rt "test-cases-advanced-cases.t#case-with-dashes" |
|
1739 | $ rt "test-cases-advanced-cases.t#case-with-dashes" | |
1740 |
|
1740 | |||
1741 | --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t |
|
1741 | --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t | |
1742 |
+++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t |
|
1742 | +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#case-with-dashes.err | |
1743 | @@ -1,3 +1,3 @@ |
|
1743 | @@ -1,3 +1,3 @@ | |
1744 | #testcases simple case-with-dashes casewith_-.chars |
|
1744 | #testcases simple case-with-dashes casewith_-.chars | |
1745 | $ echo $TESTCASE |
|
1745 | $ echo $TESTCASE | |
@@ -1756,7 +1756,7 Support running complex test cases names | |||||
1756 | $ rt "test-cases-advanced-cases.t#casewith_-.chars" |
|
1756 | $ rt "test-cases-advanced-cases.t#casewith_-.chars" | |
1757 |
|
1757 | |||
1758 | --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t |
|
1758 | --- $TESTTMP/anothertests/cases/test-cases-advanced-cases.t | |
1759 |
+++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t |
|
1759 | +++ $TESTTMP/anothertests/cases/test-cases-advanced-cases.t#casewith_-.chars.err | |
1760 | @@ -1,3 +1,3 @@ |
|
1760 | @@ -1,3 +1,3 @@ | |
1761 | #testcases simple case-with-dashes casewith_-.chars |
|
1761 | #testcases simple case-with-dashes casewith_-.chars | |
1762 | $ echo $TESTCASE |
|
1762 | $ echo $TESTCASE |
General Comments 0
You need to be logged in to leave comments.
Login now