diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-16 21:30:14 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-16 21:30:14 +0300 |
| commit | 668d679c01175e8a8e5a300fd657c333ab151d43 (patch) | |
| tree | baf059e99a4e446ea55d89ef9cf1467a122960a9 | |
| parent | 6579af34f3e0b4b93c2269f24613aefc48e419b7 (diff) | |
| download | meson-668d679c01175e8a8e5a300fd657c333ab151d43.zip meson-668d679c01175e8a8e5a300fd657c333ab151d43.tar.gz meson-668d679c01175e8a8e5a300fd657c333ab151d43.tar.bz2 | |
Some windows cleanups.
| -rw-r--r-- | interpreter.py | 5 | ||||
| -rwxr-xr-x | run_tests.py | 2 | ||||
| -rw-r--r-- | test cases/common/55 file grabber/grabber.bat | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/interpreter.py b/interpreter.py index d09622a..7328cba 100644 --- a/interpreter.py +++ b/interpreter.py @@ -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() diff --git a/run_tests.py b/run_tests.py index 96fff21..ebf7d95 100755 --- a/run_tests.py +++ b/run_tests.py @@ -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'] diff --git a/test cases/common/55 file grabber/grabber.bat b/test cases/common/55 file grabber/grabber.bat index 5c95762..8660314 100644 --- a/test cases/common/55 file grabber/grabber.bat +++ b/test cases/common/55 file grabber/grabber.bat @@ -1,4 +1,4 @@ -@echo off +@ECHO OFF echo a.c echo b.c echo c.c |