comparison tests/run-tests.py @ 47500:23f5ed6dbcb1

run-tests: stop writing a `python3` symlink pointing to python2

Having `python3` actually pointing to `python2` is bad. So we stop doing so.

In addition we need to re-introduce a `python` executable since some of the
script really need to be able to say "current python" in their shbang. For
example, `hghave` is one of such script.

The faulty changes where introduced by c102b704edb5.

Differential Revision: https://phab.mercurial-scm.org/D10943

47499:9b1710c50230

    def _usecorrectpython(self):
        """Configure the environment to use the appropriate Python in tests."""
        # Tests must use the same interpreter as us or bad things will happen.
        if sys.platform == 'win32':
            pyexename = b'python.exe'
        else:
            pyexename = b'python3'  # XXX this is wrong with python2...

        # os.symlink() is a thing with py3 on Windows, but it requires
        # Administrator rights.
        if getattr(os, 'symlink', None) and os.name != 'nt':
            msg = "# Making python executable in test path a symlink to '%s'"
            msg %= sysexecutable
            vlog(msg)
            for pyexename in [pyexename]:
                mypython = os.path.join(self._tmpbindir, pyexename)
                try:
                    if os.readlink(mypython) == sysexecutable:
                        continue
                    os.unlink(mypython)

            # launcher so the shebang lines work.
            if os.getenv('MSYSTEM'):
                with open(osenvironb[b'RUNTESTDIR'] + b'/python3', 'wb') as f:
                    f.write(b'#!/bin/sh\n')
                    f.write(b'py -3.%d "$@"\n' % sys.version_info[1])

            exedir, exename = os.path.split(sysexecutable)
            msg = "# Modifying search path to find %s as %s in '%s'"
            msg %= (exename, pyexename, exedir)
            vlog(msg)
            path = os.environ['PATH'].split(os.pathsep)
            while exedir in path:
                path.remove(exedir)

            # Binaries installed by pip into the user area like pylint.exe may

                    )

                extra_paths.append(scripts_dir)

            os.environ['PATH'] = os.pathsep.join(extra_paths + path)
            if not self._findprogram(pyexename):
                print("WARNING: Cannot find %s in search path" % pyexename)

    def _installhg(self):
        """Install hg into the test environment.

        This will also configure hg with the appropriate testing settings.

47500:23f5ed6dbcb1

    def _usecorrectpython(self):
        """Configure the environment to use the appropriate Python in tests."""
        # Tests must use the same interpreter as us or bad things will happen.
        if sys.platform == 'win32':
            pyexe_names = [b'python', b'python.exe']
        elif sys.version_info[0] < 3:
            pyexe_names = [b'python', b'python2']
        else:
            pyexe_names = [b'python', b'python3']

        # os.symlink() is a thing with py3 on Windows, but it requires
        # Administrator rights.
        if getattr(os, 'symlink', None) and os.name != 'nt':
            msg = "# Making python executable in test path a symlink to '%s'"
            msg %= sysexecutable
            vlog(msg)
            for pyexename in pyexe_names:
                mypython = os.path.join(self._tmpbindir, pyexename)
                try:
                    if os.readlink(mypython) == sysexecutable:
                        continue
                    os.unlink(mypython)

            # launcher so the shebang lines work.
            if os.getenv('MSYSTEM'):
                with open(osenvironb[b'RUNTESTDIR'] + b'/python3', 'wb') as f:
                    f.write(b'#!/bin/sh\n')
                    f.write(b'py -3.%d "$@"\n' % sys.version_info[1])
            if os.getenv('MSYSTEM'):
                with open(osenvironb[b'RUNTESTDIR'] + b'/python2', 'wb') as f:
                    f.write(b'#!/bin/sh\n')
                    f.write(b'py -2.%d "$@"\n' % sys.version_info[1])

            exedir, exename = os.path.split(sysexecutable)
            for pyexename in pyexe_names:
                msg = "# Modifying search path to find %s as %s in '%s'"
                msg %= (exename, pyexename, exedir)
                vlog(msg)
            path = os.environ['PATH'].split(os.pathsep)
            while exedir in path:
                path.remove(exedir)

            # Binaries installed by pip into the user area like pylint.exe may

                    )

                extra_paths.append(scripts_dir)

            os.environ['PATH'] = os.pathsep.join(extra_paths + path)
            for pyexename in pyexe_names:
                if not self._findprogram(pyexename):
                    print("WARNING: Cannot find %s in search path" % pyexename)

    def _installhg(self):
        """Install hg into the test environment.

        This will also configure hg with the appropriate testing settings.