tests/run-tests.py
branchstable
changeset 1151 676dce49d8e6
parent 1150 feb29f7d0066
child 1152 9a4ed3acf89e
equal deleted inserted replaced
1150:feb29f7d0066 1151:676dce49d8e6
   474 
   474 
   475 def pytest(test, wd, options, replacements):
   475 def pytest(test, wd, options, replacements):
   476     py3kswitch = options.py3k_warnings and ' -3' or ''
   476     py3kswitch = options.py3k_warnings and ' -3' or ''
   477     cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
   477     cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
   478     vlog("# Running", cmd)
   478     vlog("# Running", cmd)
       
   479     if os.name == 'nt':
       
   480         replacements.append((r'\r\n', '\n'))
   479     return run(cmd, wd, options, replacements)
   481     return run(cmd, wd, options, replacements)
   480 
   482 
   481 def shtest(test, wd, options, replacements):
   483 def shtest(test, wd, options, replacements):
   482     cmd = '%s "%s"' % (options.shell, test)
   484     cmd = '%s "%s"' % (options.shell, test)
   483     vlog("# Running", cmd)
   485     vlog("# Running", cmd)