Rebased so commit history is correct now

4 files changed, 5 insertions, 9 deletions

diff --git a/suite/generator.py b/suite/generator.py
index ad0d24fc..f4ee69ee 100755
--- a/suite/generator.py
+++ b/suite/generator.py
@@ -22,6 +22,7 @@ from collections import Counter
 global verbose
 verbose = False
 
+
 class TestBinaryNinjaAPI(unittest.TestCase):
     # Returns a tuple of:
     #   bool   : Two lists are equal
diff --git a/suite/oracle.pkl b/suite/oracle.pkl
index d7ce1115..f0be17d4 100644
--- a/suite/oracle.pkl
+++ b/suite/oracle.pkl
diff --git a/suite/testcommon.py b/suite/testcommon.py
index ef85c053..07ceb592 100644
--- a/suite/testcommon.py
+++ b/suite/testcommon.py
@@ -541,6 +541,7 @@ class TestBuilder(Builder):
         """Types produced different result"""
         file_name = os.path.join(self.test_store, "helloworld")
         bv = binja.BinaryViewType.get_view_of_file(file_name)
+
         preprocessed = binja.preprocess_source("""
         #ifdef nonexistant
         int foo = 1;
@@ -550,7 +551,7 @@ class TestBuilder(Builder):
         long long bar1 = 2;
         #endif
         """)
-        source = '\n'.join([i.decode('utf-8') for i in preprocessed[0].split(b'\n') if not b'#line' in i and len(i) > 0])
+        source = '\n'.join([i.decode('charmap') for i in preprocessed[0].split(b'\n') if not b'#line' in i and len(i) > 0])
         typelist = bv.platform.parse_types_from_source(source)
         inttype = binja.Type.int(4)
 
@@ -566,14 +567,13 @@ class TestBuilder(Builder):
         retinfo.append("Type equality: " + str((inttype == inttype) and not (inttype != inttype)))
         return retinfo
 
-
     def test_Plugin_bin_info(self):
         """print_syscalls plugin produced different result"""
         file_name = os.path.join(self.test_store, "helloworld")
         self.unpackage_file(file_name)
         result = subprocess.Popen(["python", os.path.join(self.examples_dir, "bin_info.py"), file_name], stdout=subprocess.PIPE).communicate()[0]
         # normalize line endings and path sep
-        return [result.replace(b"\\", b"/").replace(b"\r\n", b"\n").decode("charmap")]
+        return [line for line in result.replace(b"\\", b"/").replace(b"\r\n", b"\n").decode("charmap").split("\n")]
 
     def test_linear_disassembly(self):
         """linear_disassembly produced different result"""
diff --git a/suite/unit.py b/suite/unit.py
index 9cbed511..e01b0f19 100644
--- a/suite/unit.py
+++ b/suite/unit.py
@@ -13,6 +13,7 @@ from collections import Counter
 global verbose
 verbose = False
 
+
 class TestBinaryNinjaAPI(unittest.TestCase):
     # Returns a tuple of:
     #   bool   : Two lists are equal
@@ -235,12 +236,6 @@ class TestBinaryNinjaAPI(unittest.TestCase):
     def test_binary___loop_constant_propagate(self):
         self.run_binary_test('suite/binaries/test_corpus/loop_constant_propagate.zip')
 
-    def test_binary___ls(self):
-        self.run_binary_test('suite/binaries/test_corpus/ls.zip')
-
-    def test_binary___md5(self):
-        self.run_binary_test('suite/binaries/test_corpus/md5.zip')
-
     def test_binary___partial_register_dataflow(self):
         self.run_binary_test('suite/binaries/test_corpus/partial_register_dataflow.zip')