##// END OF EJS Templates
run-tests: use byte strings for inserted output...
Gregory Szorc -
r43726:d9e7ac50 stable
parent child Browse files
Show More
@@ -1770,7 +1770,9 b' class TTest(Test):'
1770 if l.startswith(b'#require'):
1770 if l.startswith(b'#require'):
1771 lsplit = l.split()
1771 lsplit = l.split()
1772 if len(lsplit) < 2 or lsplit[0] != b'#require':
1772 if len(lsplit) < 2 or lsplit[0] != b'#require':
1773 after.setdefault(pos, []).append(' !!! invalid #require\n')
1773 after.setdefault(pos, []).append(
1774 b' !!! invalid #require\n'
1775 )
1774 if not skipping:
1776 if not skipping:
1775 haveresult, message = self._hghave(lsplit[1:])
1777 haveresult, message = self._hghave(lsplit[1:])
1776 if not haveresult:
1778 if not haveresult:
@@ -1780,19 +1782,19 b' class TTest(Test):'
1780 elif l.startswith(b'#if'):
1782 elif l.startswith(b'#if'):
1781 lsplit = l.split()
1783 lsplit = l.split()
1782 if len(lsplit) < 2 or lsplit[0] != b'#if':
1784 if len(lsplit) < 2 or lsplit[0] != b'#if':
1783 after.setdefault(pos, []).append(' !!! invalid #if\n')
1785 after.setdefault(pos, []).append(b' !!! invalid #if\n')
1784 if skipping is not None:
1786 if skipping is not None:
1785 after.setdefault(pos, []).append(' !!! nested #if\n')
1787 after.setdefault(pos, []).append(b' !!! nested #if\n')
1786 skipping = not self._iftest(lsplit[1:])
1788 skipping = not self._iftest(lsplit[1:])
1787 after.setdefault(pos, []).append(l)
1789 after.setdefault(pos, []).append(l)
1788 elif l.startswith(b'#else'):
1790 elif l.startswith(b'#else'):
1789 if skipping is None:
1791 if skipping is None:
1790 after.setdefault(pos, []).append(' !!! missing #if\n')
1792 after.setdefault(pos, []).append(b' !!! missing #if\n')
1791 skipping = not skipping
1793 skipping = not skipping
1792 after.setdefault(pos, []).append(l)
1794 after.setdefault(pos, []).append(l)
1793 elif l.startswith(b'#endif'):
1795 elif l.startswith(b'#endif'):
1794 if skipping is None:
1796 if skipping is None:
1795 after.setdefault(pos, []).append(' !!! missing #if\n')
1797 after.setdefault(pos, []).append(b' !!! missing #if\n')
1796 skipping = None
1798 skipping = None
1797 after.setdefault(pos, []).append(l)
1799 after.setdefault(pos, []).append(l)
1798 elif skipping:
1800 elif skipping:
@@ -1841,7 +1843,7 b' class TTest(Test):'
1841 if inpython:
1843 if inpython:
1842 script.append(b'EOF\n')
1844 script.append(b'EOF\n')
1843 if skipping is not None:
1845 if skipping is not None:
1844 after.setdefault(pos, []).append(' !!! missing #endif\n')
1846 after.setdefault(pos, []).append(b' !!! missing #endif\n')
1845 addsalt(n + 1, False)
1847 addsalt(n + 1, False)
1846 # Need to end any current per-command trace
1848 # Need to end any current per-command trace
1847 if activetrace:
1849 if activetrace:
General Comments 0
You need to be logged in to leave comments. Login now