Some windows cleanups.

pull/15/head
Jussi Pakkanen 11 years ago
parent 6579af34f3
commit 668d679c01
  1. 5
      interpreter.py
  2. 2
      run_tests.py
  3. 2
      test cases/common/55 file grabber/grabber.bat

@ -68,8 +68,8 @@ class RunProcess(InterpreterObject):
pc = self.run_command(command_array, source_dir, build_dir, subdir)
(stdout, stderr) = pc.communicate()
self.returncode = pc.returncode
self.stdout = stdout.decode()
self.stderr = stderr.decode()
self.stdout = stdout.decode().replace('\r\n', '\n')
self.stderr = stderr.decode().replace('\r\n', '\n')
self.methods.update({'returncode' : self.returncode_method,
'stdout' : self.stdout_method,
'stderr' : self.stderr_method,
@ -1266,7 +1266,6 @@ class Interpreter():
s = posargs[0]
if not isinstance(s, str):
raise InterpreterException('Split() argument must be a string')
print(obj.split(s))
return obj.split(s)
else:
return obj.split()

@ -25,7 +25,7 @@ test_build_dir = 'work area'
install_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], 'install dir')
meson_command = './meson.py'
msbuild_exe = shutil.which('msbuild')
msbuild_exe = None#shutil.which('msbuild')
if msbuild_exe is not None:
backend_flags = ['--backend=vs2010']

@ -1,4 +1,4 @@
@echo off
@ECHO OFF
echo a.c
echo b.c
echo c.c

Loading…
Cancel
Save