27 files changed, 9 insertions, 2 deletions
diff --git a/test/passes/fannkuch0.bin.txt b/test/passes/fannkuch0_dwarf.bin.txt
index 7e225f9b0..7e225f9b0 100644
--- a/test/passes/fannkuch0.bin.txt
+++ b/test/passes/fannkuch0_dwarf.bin.txt
diff --git a/test/passes/fannkuch0.passes b/test/passes/fannkuch0_dwarf.passes
index edbfb02ae..edbfb02ae 100644
--- a/test/passes/fannkuch0.passes
+++ b/test/passes/fannkuch0_dwarf.passes
diff --git a/test/passes/fannkuch0.wasm b/test/passes/fannkuch0_dwarf.wasm
index ab40bedc4..ab40bedc4 100644
--- a/test/passes/fannkuch0.wasm
+++ b/test/passes/fannkuch0_dwarf.wasm
diff --git a/test/passes/fannkuch3.bin.txt b/test/passes/fannkuch3_dwarf.bin.txt
index 658e2e0a9..658e2e0a9 100644
--- a/test/passes/fannkuch3.bin.txt
+++ b/test/passes/fannkuch3_dwarf.bin.txt
diff --git a/test/passes/fannkuch3.passes b/test/passes/fannkuch3_dwarf.passes
index edbfb02ae..edbfb02ae 100644
--- a/test/passes/fannkuch3.passes
+++ b/test/passes/fannkuch3_dwarf.passes
diff --git a/test/passes/fannkuch3.wasm b/test/passes/fannkuch3_dwarf.wasm
index 54a06c057..54a06c057 100644
--- a/test/passes/fannkuch3.wasm
+++ b/test/passes/fannkuch3_dwarf.wasm
diff --git a/test/passes/fannkuch3_manyopts.bin.txt b/test/passes/fannkuch3_manyopts_dwarf.bin.txt
index e9029b6b8..e9029b6b8 100644
--- a/test/passes/fannkuch3_manyopts.bin.txt
+++ b/test/passes/fannkuch3_manyopts_dwarf.bin.txt
diff --git a/test/passes/fannkuch3_manyopts.passes b/test/passes/fannkuch3_manyopts_dwarf.passes
index 8324d57aa..8324d57aa 100644
--- a/test/passes/fannkuch3_manyopts.passes
+++ b/test/passes/fannkuch3_manyopts_dwarf.passes
diff --git a/test/passes/fannkuch3_manyopts.wasm b/test/passes/fannkuch3_manyopts_dwarf.wasm
index 54a06c057..54a06c057 100644
--- a/test/passes/fannkuch3_manyopts.wasm
+++ b/test/passes/fannkuch3_manyopts_dwarf.wasm
diff --git a/test/passes/fib2.bin.txt b/test/passes/fib2_dwarf.bin.txt
index ac0c26cf5..ac0c26cf5 100644
--- a/test/passes/fib2.bin.txt
+++ b/test/passes/fib2_dwarf.bin.txt
diff --git a/test/passes/fib2.passes b/test/passes/fib2_dwarf.passes
index edbfb02ae..edbfb02ae 100644
--- a/test/passes/fib2.passes
+++ b/test/passes/fib2_dwarf.passes
diff --git a/test/passes/fib2.wasm b/test/passes/fib2_dwarf.wasm
index 01314643e..01314643e 100644
--- a/test/passes/fib2.wasm
+++ b/test/passes/fib2_dwarf.wasm
diff --git a/test/passes/fib2_emptylocspan.bin.txt b/test/passes/fib2_emptylocspan_dwarf.bin.txt
index 21f2fb878..21f2fb878 100644
--- a/test/passes/fib2_emptylocspan.bin.txt
+++ b/test/passes/fib2_emptylocspan_dwarf.bin.txt
diff --git a/test/passes/fib2_emptylocspan.passes b/test/passes/fib2_emptylocspan_dwarf.passes
index edbfb02ae..edbfb02ae 100644
--- a/test/passes/fib2_emptylocspan.passes
+++ b/test/passes/fib2_emptylocspan_dwarf.passes
diff --git a/test/passes/fib2_emptylocspan.wasm b/test/passes/fib2_emptylocspan_dwarf.wasm
index 94e6cb5b9..94e6cb5b9 100644
--- a/test/passes/fib2_emptylocspan.wasm
+++ b/test/passes/fib2_emptylocspan_dwarf.wasm
diff --git a/test/passes/fib_nonzero-low-pc.bin.txt b/test/passes/fib_nonzero-low-pc_dwarf.bin.txt
index ac28b21a4..ac28b21a4 100644
--- a/test/passes/fib_nonzero-low-pc.bin.txt
+++ b/test/passes/fib_nonzero-low-pc_dwarf.bin.txt
diff --git a/test/passes/fib_nonzero-low-pc.passes b/test/passes/fib_nonzero-low-pc_dwarf.passes
index 523725b1c..523725b1c 100644
--- a/test/passes/fib_nonzero-low-pc.passes
+++ b/test/passes/fib_nonzero-low-pc_dwarf.passes
diff --git a/test/passes/fib_nonzero-low-pc.wasm b/test/passes/fib_nonzero-low-pc_dwarf.wasm
index 5f44336d4..5f44336d4 100644
--- a/test/passes/fib_nonzero-low-pc.wasm
+++ b/test/passes/fib_nonzero-low-pc_dwarf.wasm
diff --git a/test/passes/ignore_missing_func.bin.txt b/test/passes/ignore_missing_func_dwarf.bin.txt
index c5f45cfdc..c5f45cfdc 100644
--- a/test/passes/ignore_missing_func.bin.txt
+++ b/test/passes/ignore_missing_func_dwarf.bin.txt
diff --git a/test/passes/ignore_missing_func.passes b/test/passes/ignore_missing_func_dwarf.passes
index a85a46b5e..a85a46b5e 100644
--- a/test/passes/ignore_missing_func.passes
+++ b/test/passes/ignore_missing_func_dwarf.passes
diff --git a/test/passes/ignore_missing_func.wasm b/test/passes/ignore_missing_func_dwarf.wasm
index 68c6de155..68c6de155 100644
--- a/test/passes/ignore_missing_func.wasm
+++ b/test/passes/ignore_missing_func_dwarf.wasm
diff --git a/test/passes/multi_line_table.bin.txt b/test/passes/multi_line_table_dwarf.bin.txt
index 84305a175..84305a175 100644
--- a/test/passes/multi_line_table.bin.txt
+++ b/test/passes/multi_line_table_dwarf.bin.txt
diff --git a/test/passes/multi_line_table.passes b/test/passes/multi_line_table_dwarf.passes
index 9e52f4d0c..9e52f4d0c 100644
--- a/test/passes/multi_line_table.passes
+++ b/test/passes/multi_line_table_dwarf.passes
diff --git a/test/passes/multi_line_table.wasm b/test/passes/multi_line_table_dwarf.wasm
index 312c013da..312c013da 100644
--- a/test/passes/multi_line_table.wasm
+++ b/test/passes/multi_line_table_dwarf.wasm
diff --git a/test/unit/test_asyncify.py b/test/unit/test_asyncify.py
index 55b198cbb..1010c07c4 100644
--- a/test/unit/test_asyncify.py
+++ b/test/unit/test_asyncify.py
@@ -29,7 +29,7 @@ class AsyncifyTest(utils.BinaryenTestCase):
             shared.run_process(shared.WASM_DIS + ['a.wasm', '-o', 'a.wat'])
             output = shared.run_process(shared.WASM_SHELL + ['a.wat'], capture_output=True).stdout
             with open(self.input_path('asyncify-pure.txt'), 'r') as f:
-                self.assertEqual(f.read(), output)
+                self.assert_equal_ignoring_line_endings(f.read(), output)
 
         # test wat input
         wat = self.input_path('asyncify-pure.wat')
diff --git a/test/unit/test_features.py b/test/unit/test_features.py
index 3b30595d6..506fd8809 100644
--- a/test/unit/test_features.py
+++ b/test/unit/test_features.py
@@ -354,4 +354,4 @@ class TargetFeaturesSectionTest(utils.BinaryenTestCase):
             '--enable-tail-call',
             '--enable-reference-types',
             '--enable-multivalue'
-        ], p2.stdout.split())
+        ], p2.stdout.splitlines())
diff --git a/test/unit/utils.py b/test/unit/utils.py
index a9bfc3740..d91141e36 100644
--- a/test/unit/utils.py
+++ b/test/unit/utils.py
@@ -36,3 +36,10 @@ class BinaryenTestCase(unittest.TestCase):
         self.assertEqual(p.stderr, '')
         self.assertEqual(p.stdout.split('\n')[:-1],
                          ['--enable-' + f for f in features])
+
+    # similar to assertEqual, but while ignoring line ending differences such
+    # as those between windows and unix
+    def assert_equal_ignoring_line_endings(self, left, right):
+        left = left.replace('\r\n', '\n')
+        right = right.replace('\r\n', '\n')
+        self.assertEqual(left, right)