comparison tests/run-tests.py @ 50210:6515d9a6592d stable

run-tests: make it possible to nest conditionals

This is not that hard to implement and makes our life easier on a regular basis.

50180:be019ac8c1e4

        # Expected shell script output.
        expected = {}

        pos = prepos = -1

        # True or False when in a true or false conditional section
        skipping = None

        # We keep track of whether or not we're in a Python block so we
        # can generate the surrounding doctest magic.
        inpython = False

                lsplit = l.split()
                if len(lsplit) < 2 or lsplit[0] != b'#require':
                    after.setdefault(pos, []).append(
                        b'  !!! invalid #require\n'
                    )
                if not skipping:
                    haveresult, message = self._hghave(lsplit[1:])
                    if not haveresult:
                        script = [b'echo "%s"\nexit 80\n' % message]
                        break
                after.setdefault(pos, []).append(l)
            elif l.startswith(b'#if'):
                lsplit = l.split()
                if len(lsplit) < 2 or lsplit[0] != b'#if':
                    after.setdefault(pos, []).append(b'  !!! invalid #if\n')
                if skipping is not None:
                    after.setdefault(pos, []).append(b'  !!! nested #if\n')
                skipping = not self._iftest(lsplit[1:])
                after.setdefault(pos, []).append(l)
            elif l.startswith(b'#else'):
                if skipping is None:
                    after.setdefault(pos, []).append(b'  !!! missing #if\n')
                skipping = not skipping
                after.setdefault(pos, []).append(l)
            elif l.startswith(b'#endif'):
                if skipping is None:
                    after.setdefault(pos, []).append(b'  !!! missing #if\n')
                skipping = None
                after.setdefault(pos, []).append(l)
            elif skipping:
                after.setdefault(pos, []).append(l)
            elif l.startswith(b'  >>> '):  # python inlines
                after.setdefault(pos, []).append(l)
                prepos = pos
                pos = n

                # Non-command/result. Queue up for merged output.
                after.setdefault(pos, []).append(l)

        if inpython:
            script.append(b'EOF\n')
        if skipping is not None:
            after.setdefault(pos, []).append(b'  !!! missing #endif\n')
        addsalt(n + 1, False)
        # Need to end any current per-command trace
        if activetrace:
            toggletrace()

50210:6515d9a6592d

        # Expected shell script output.
        expected = {}

        pos = prepos = -1

        # The current stack of conditionnal section.
        # Each relevant conditionnal section can have the following value:
        #  - True:  we should run this block
        #  - False: we should skip this block
        #  - None:  The parent block is skipped,
        #           (no branch of this one will ever run)
        condition_stack = []

        def run_line():
            """return True if the current line should be run"""
            if not condition_stack:
                return True
            return bool(condition_stack[-1])

        def push_conditional_block(should_run):
            """Push a new conditional context, with its initial state

            i.e. entry a #if block"""
            if not run_line():
                condition_stack.append(None)
            else:
                condition_stack.append(should_run)

        def flip_conditional():
            """reverse the current condition state

            i.e. enter a #else
            """
            assert condition_stack
            if condition_stack[-1] is not None:
                condition_stack[-1] = not condition_stack[-1]

        def pop_conditional():
            """exit the current skipping context

            i.e. reach the #endif"""
            assert condition_stack
            condition_stack.pop()

        # We keep track of whether or not we're in a Python block so we
        # can generate the surrounding doctest magic.
        inpython = False

                lsplit = l.split()
                if len(lsplit) < 2 or lsplit[0] != b'#require':
                    after.setdefault(pos, []).append(
                        b'  !!! invalid #require\n'
                    )
                if run_line():
                    haveresult, message = self._hghave(lsplit[1:])
                    if not haveresult:
                        script = [b'echo "%s"\nexit 80\n' % message]
                        break
                after.setdefault(pos, []).append(l)
            elif l.startswith(b'#if'):
                lsplit = l.split()
                if len(lsplit) < 2 or lsplit[0] != b'#if':
                    after.setdefault(pos, []).append(b'  !!! invalid #if\n')
                push_conditional_block(self._iftest(lsplit[1:]))
                after.setdefault(pos, []).append(l)
            elif l.startswith(b'#else'):
                if not condition_stack:
                    after.setdefault(pos, []).append(b'  !!! missing #if\n')
                flip_conditional()
                after.setdefault(pos, []).append(l)
            elif l.startswith(b'#endif'):
                if not condition_stack:
                    after.setdefault(pos, []).append(b'  !!! missing #if\n')
                pop_conditional()
                after.setdefault(pos, []).append(l)
            elif not run_line():
                after.setdefault(pos, []).append(l)
            elif l.startswith(b'  >>> '):  # python inlines
                after.setdefault(pos, []).append(l)
                prepos = pos
                pos = n

                # Non-command/result. Queue up for merged output.
                after.setdefault(pos, []).append(l)

        if inpython:
            script.append(b'EOF\n')
        if condition_stack:
            after.setdefault(pos, []).append(b'  !!! missing #endif\n')
        addsalt(n + 1, False)
        # Need to end any current per-command trace
        if activetrace:
            toggletrace()