From: Dov Grobgeld <dov.grobgeld@gmail.com>
Date: Sat, 10 Mar 2018 16:38:36 +0000 (+0200)
Subject: Two test fixes for meson.
X-Git-Tag: v1.0.2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d452bd553e076d0a542ad65c6ecfd9ba310607b9;p=fribidi

Two test fixes for meson.

* Added the isolate test to the test suite.
* Fixed CR/LF problem in test-runner.py on Windows when working
  out of git. (Reference files contain CRLF).
---

diff --git a/test/meson.build b/test/meson.build
index 9f7e1a7..45bd862 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,6 +1,7 @@
 tests = [
   ['CapRTL', 'explicit'],
   ['CapRTL', 'implicit'],
+  ['CapRTL', 'isolate'],
   ['ISO8859-8', 'hebrew'],
   ['UTF-8', 'persian'],
   ['UTF-8', 'reordernsm'],
diff --git a/test/test-runner.py b/test/test-runner.py
index 9b0fa81..1ea9df8 100755
--- a/test/test-runner.py
+++ b/test/test-runner.py
@@ -23,9 +23,10 @@ if os.name == 'nt':
 
 try:
   output = subprocess.check_output([test_exe, '--test', '--charset', charset, input_file])
+  ref_data = open(reference_file, "rb").read()
   if os.name == 'nt':
     output = output.replace(b'\r\n', b'\n')
-  ref_data = open(reference_file, "rb").read()
+    ref_data = ref_data.replace(b'\r\n', b'\n') 
   if output != ref_data:
     print('Output:\n', output)
     print('Reference file:\n', ref_data)