From 9bd54df7ba7dd15783f5a9180c85a7137dcdbc08 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 10 Jun 2015 19:37:02 +0200
Subject: Problem running tests under Windows

The redirection used in the runtests.py script was based on *nix type systems. Corrected for windows.
Windows has a different line ending than *nix, resulting in a problem with diff unless the options -b -w are used.
Some tests had as directory for some paths a directory . this has been corrected to $INPUTDIR
---
 testing/022_dot.cpp   | 2 +-
 testing/031_image.dox | 2 +-
 testing/runtests.py   | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/testing/022_dot.cpp b/testing/022_dot.cpp
index 2db7c38..74d3f7a 100644
--- a/testing/022_dot.cpp
+++ b/testing/022_dot.cpp
@@ -1,7 +1,7 @@
 // objective: test the \dot and \enddot commands
 // check: indexpage.xml
 // config: HAVE_DOT = YES
-// config: DOTFILE_DIRS = .
+// config: DOTFILE_DIRS = $INPUTDIR
 
 /*! class B */
 class B {};
diff --git a/testing/031_image.dox b/testing/031_image.dox
index 96ba43b..f437086 100644
--- a/testing/031_image.dox
+++ b/testing/031_image.dox
@@ -1,6 +1,6 @@
 // objective: test the \image command
 // check: indexpage.xml
-// config: IMAGE_PATH = .
+// config: IMAGE_PATH = $INPUTDIR
 /** \mainpage
  * Some text.
  * \image html sample.png
diff --git a/testing/runtests.py b/testing/runtests.py
index a5e82bf..149d457 100644
--- a/testing/runtests.py
+++ b/testing/runtests.py
@@ -25,7 +25,7 @@ class Tester:
 		elif not os.path.isfile(expected_file):
 			return (True,'%s absent' % expected_file)
 		else:
-			diff = os.popen('diff -u %s %s' % (got_file,expected_file)).read()
+			diff = os.popen('diff -b -w -u %s %s' % (got_file,expected_file)).read()
 			if diff and not diff.startswith("No differences"):
 				return (True,'Difference between generated output and reference:\n%s' % diff)
 		return (False,'')
@@ -66,7 +66,11 @@ class Tester:
 			sys.exit(1)
 
 		# run doxygen
-		if os.system('%s %s/Doxyfile 2>/dev/null' % (self.args.doxygen,self.test_out))!=0:
+		if (sys.platform == 'win32'):
+			redir=' > nul:'             
+		else:
+			redir=' 2> /dev/null'             
+		if os.system('%s %s/Doxyfile %s' % (self.args.doxygen,self.test_out, redir))!=0:
 			print('Error: failed to run %s on %s/Doxyfile' % (self.args.doxygen,self.test_out));
 			sys.exit(1)
 
-- 
cgit v0.12