diff -r dd384ad01d88 -r c827bb7b5806 tests/run-tests.py --- a/tests/run-tests.py Wed Apr 06 18:44:21 2022 +0200 +++ b/tests/run-tests.py Wed Apr 06 18:50:20 2022 +0200 @@ -1433,6 +1433,9 @@ env['PYTHONUSERBASE'] = sysconfig.get_config_var('userbase') or '' env['HGEMITWARNINGS'] = '1' env['TESTTMP'] = _bytes2sys(self._testtmp) + # the FORWARD_SLASH version is useful when running `sh` on non unix + # system (e.g. Windows) + env['TESTTMP_FORWARD_SLASH'] = env['TESTTMP'].replace(os.sep, '/') uid_file = os.path.join(_bytes2sys(self._testtmp), 'UID') env['HGTEST_UUIDFILE'] = uid_file env['TESTNAME'] = self.name @@ -3113,6 +3116,10 @@ if pathname: testdir = os.path.join(testdir, pathname) self._testdir = osenvironb[b'TESTDIR'] = testdir + osenvironb[b'TESTDIR_FORWARD_SLASH'] = osenvironb[b'TESTDIR'].replace( + os.sep.encode('ascii'), b'/' + ) + if self.options.outputdir: self._outputdir = canonpath(_sys2bytes(self.options.outputdir)) else: @@ -3257,6 +3264,9 @@ fileb = _sys2bytes(__file__) runtestdir = os.path.abspath(os.path.dirname(fileb)) osenvironb[b'RUNTESTDIR'] = runtestdir + osenvironb[b'RUNTESTDIR_FORWARD_SLASH'] = runtestdir.replace( + os.sep.encode('ascii'), b'/' + ) if PYTHON3: sepb = _sys2bytes(os.pathsep) else: