Mercurial > hg

comparison tests/test-run-tests.t @ 38823:a9a4b0fc1e5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
testrunner: use "#" for "test cases" suffix in .err filename too This seems like a natural follow-up to b865bba56db1 (run-tests: update the test case name format, 2018-05-13). Differential Revision: https://phab.mercurial-scm.org/D4052
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 01 Aug 2018 22:32:51 -0700
parents f4a214300957
children 3086a8627b29
comparison
equal deleted inserted replaced
38822:f8732e33bcbc 38823:a9a4b0fc1e5d
848 > y 848 > y
849 > y 849 > y
850 > EOF 850 > EOF
851 851
852 --- $TESTTMP/test-cases.t 852 --- $TESTTMP/test-cases.t
853 +++ $TESTTMP/test-cases.t.a.err 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
857 $ echo 1 857 $ echo 1
858 + 1 858 + 1
859 #endif 859 #endif
860 #if b 860 #if b
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.b.err 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
868 $ echo 2 868 $ echo 2
869 + 2 869 + 2
1538 > [1] 1538 > [1]
1539 > EOF 1539 > EOF
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.B.err 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
1547 $ echo $V | sed 's/A/C/' 1547 $ echo $V | sed 's/A/C/'
1548 - C 1548 - C
1561 --restart works 1561 --restart works
1562 1562
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.B.err 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
1570 $ echo $V | sed 's/A/C/' 1570 $ echo $V | sed 's/A/C/'
1571 - C 1571 - C
1582 [1] 1582 [1]
1583 1583
1584 --restart works with outputdir 1584 --restart works with outputdir
1585 1585
1586 $ mkdir output 1586 $ mkdir output
1587 $ mv test-cases-abc.t.B.err output 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.B.err 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
1595 $ echo $V | sed 's/A/C/' 1595 $ echo $V | sed 's/A/C/'
1596 - C 1596 - C
1629 Support running a specific test case 1629 Support running a specific test case
1630 1630
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.B.err 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
1638 $ echo $V | sed 's/A/C/' 1638 $ echo $V | sed 's/A/C/'
1639 - C 1639 - C
1652 Support running multiple test cases in the same file 1652 Support running multiple test cases in the same file
1653 1653
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.B.err 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
1661 $ echo $V | sed 's/A/C/' 1661 $ echo $V | sed 's/A/C/'
1662 - C 1662 - C
1675 Support ignoring invalid test cases 1675 Support ignoring invalid test cases
1676 1676
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.B.err 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
1684 $ echo $V | sed 's/A/C/' 1684 $ echo $V | sed 's/A/C/'
1685 - C 1685 - C
1709 simple 1709 simple
1710 1710
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.case-with-dashes.err 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
1718 - simple 1718 - simple
1719 + case-with-dashes 1719 + case-with-dashes
1720 1720
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.casewith_-.chars.err 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
1728 - simple 1728 - simple
1729 + casewith_-.chars 1729 + casewith_-.chars
1737 [1] 1737 [1]
1738 1738
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.case-with-dashes.err 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
1746 - simple 1746 - simple
1747 + case-with-dashes 1747 + case-with-dashes
1754 [1] 1754 [1]
1755 1755
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.casewith_-.chars.err 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
1763 - simple 1763 - simple
1764 + casewith_-.chars 1764 + casewith_-.chars