From 668d679c01175e8a8e5a300fd657c333ab151d43 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Wed, 16 Apr 2014 21:30:14 +0300
Subject: [PATCH] Some windows cleanups.

---
 interpreter.py                                | 5 ++---
 run_tests.py                                  | 2 +-
 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 d09622a41..7328cba57 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 96fff21dd..ebf7d951c 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 5c957625b..86603145c 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