Finally, quite a few tests failed due to CR characters at the end of
each line, which the test suite considered as extra whitespace and
flagged as an error.  In addition, the calculator tests failed because
they called 'alarm' which is not available on Windows.  To fix this, I
suggest the following:

--- tests/calc.at~0     2013-08-02 18:35:13 +0300
+++ tests/calc.at       2014-10-06 19:16:27 +0300
@@ -77,7 +77,9 @@ main (int argc, const char **argv)
      Nelson H. F. Beebe.  100 seconds was enough for regular users,
      but the Hydra build farm, which is heavily loaded needs more.  */
 
+#ifndef __MINGW32__
   alarm (200);
+#endif
 
   if (argc == 2)
     input = fopen (argv[1], "r");
@@ -465,6 +467,7 @@ AT_CHECK([cat stderr], 0, [expout])
 m4_define([AT_CHECK_SPACES],
 [AT_CHECK([$PERL -ne '
   chomp;
+  s/\r$//;
   print "$ARGV:$.: {$_}\n"
     if (# No starting/ending empty lines.
         (eof || $. == 1) && /^\s*$/


--- tests/synclines.at~0        2013-08-02 18:35:13 +0300
+++ tests/synclines.at  2014-10-07 19:10:04 +0300
@@ -84,11 +84,11 @@
   # c vs. c++.
   s/^clang: warning: treating 'c' input as 'c\+\+'.*\n//gm;
   # Function context.
-  s/^[^:]*: In function '[^']+':\n//gm;
+  s/^[^:]*: In function '[^']+':\r?\n//gm;
   # Caret error.
-  s/^ *#error.*\n *\^\n//gm;
+  s/^ *#error.*\n *\^\r?\n//gm;
   # Number of errors.
-  s/^1 error generated\.\n//gm;
+  s/^1 error generated\.\r?\n//gm;
 
   # 2. Normalize the lines we kept.
 



Reply via email to