From afc4906acaeb7191e4ec085d7be4ca5b036b821d Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Wed, 8 Mar 2006 20:15:08 +0000
Subject: Some test updates for Windows. Handle SHELL set on the command line
 properly for windows.

---
 tests/ChangeLog                      |  8 ++++++++
 tests/run_make_tests.pl              |  2 +-
 tests/scripts/features/default_names | 36 ++++++------------------------------
 tests/scripts/features/targetvars    |  2 +-
 tests/scripts/options/dash-W         |  2 +-
 5 files changed, 17 insertions(+), 33 deletions(-)

(limited to 'tests')

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 57dec0d..3db7cc3 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-05  Paul D. Smith  <psmith@gnu.org>
+
+	* run_make_tests.pl (set_more_defaults): Add CYGWIN_NT as a port
+	type W32.  Fixed Savannah bug #15937.
+
+	* scripts/features/default_names: Don't call error() when the test
+	fails.  Fixes Savannah bug #15941.
+
 2006-02-17  Paul D. Smith  <psmith@gnu.org>
 
 	* scripts/features/targetvars: Test a complex construction which
diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl
index ae7536f..689ce2e 100755
--- a/tests/run_make_tests.pl
+++ b/tests/run_make_tests.pl
@@ -238,7 +238,7 @@ sub set_more_defaults
    #
    # This is probably not specific enough.
    #
-   if ($osname =~ /Windows/i || $osname =~ /MINGW32/i) {
+   if ($osname =~ /Windows/i || $osname =~ /MINGW32/i || $osname =~ /CYGWIN_NT/i) {
      $port_type = 'W32';
    }
    # Bleah, the osname is so variable on DOS.  This kind of bites.
diff --git a/tests/scripts/features/default_names b/tests/scripts/features/default_names
index 501f1fc..e53127e 100644
--- a/tests/scripts/features/default_names
+++ b/tests/scripts/features/default_names
@@ -7,59 +7,35 @@ default makefiles in the correct order (GNUmakefile,makefile,Makefile)";
 $makefile = "GNUmakefile";
 
 open(MAKEFILE,"> $makefile");
-
 print MAKEFILE "FIRST: ; \@echo It chose GNUmakefile\n";
-
 close(MAKEFILE);
 
 # DOS/WIN32 platforms preserve case, but Makefile is the same file as makefile.
 # Just test what we can here (avoid Makefile versus makefile test).
-#
-if ($port_type eq 'UNIX')
-{
+
+if ($port_type eq 'UNIX') {
   # Create another makefile called "makefile"
   open(MAKEFILE,"> makefile");
-
   print MAKEFILE "SECOND: ; \@echo It chose makefile\n";
-
   close(MAKEFILE);
 }
 
-
 # Create another makefile called "Makefile"
 open(MAKEFILE,"> Makefile");
-
 print MAKEFILE "THIRD: ; \@echo It chose Makefile\n";
-
 close(MAKEFILE);
 
 
 &run_make_with_options("","",&get_logfile);
-
-# Create the answer to what should be produced by this Makefile
-$answer = "It chose GNUmakefile\n";
-
-# COMPARE RESULTS
-
-&compare_output($answer,&get_logfile(1)) || &error("abort");
+&compare_output("It chose GNUmakefile\n",&get_logfile(1));
 unlink $makefile;
 
-# DOS/WIN32 platforms preserve case, but Makefile is the same file as makefile.
-# Just test what we can here (avoid Makefile versus makefile test).
-#
-if ($port_type eq 'UNIX')
-{
-  $answer = "It chose makefile\n";
-
+if ($port_type eq 'UNIX') {
   &run_make_with_options("","",&get_logfile);
-
-  &compare_output($answer,&get_logfile(1)) || &error("abort");
+  &compare_output("It chose makefile\n",&get_logfile(1));
   unlink "makefile";
 }
 
-$answer = "It chose Makefile\n";
-
 &run_make_with_options("","",&get_logfile);
-
-&compare_output($answer,&get_logfile(1)) || &error("abort");
+&compare_output("It chose Makefile\n",&get_logfile(1));
 unlink "Makefile";
diff --git a/tests/scripts/features/targetvars b/tests/scripts/features/targetvars
index c22ce13..18dd023 100644
--- a/tests/scripts/features/targetvars
+++ b/tests/scripts/features/targetvars
@@ -272,7 +272,7 @@ $answer = "no build information\n";
 # Test a merge of set_lists for files, where one list is much longer
 # than the other.  See Savannah bug #15757.
 
-mkdir('t1');
+mkdir('t1', 0777);
 touch('t1/rules.mk');
 
 run_make_test('
diff --git a/tests/scripts/options/dash-W b/tests/scripts/options/dash-W
index 50745f7..d3fde87 100644
--- a/tests/scripts/options/dash-W
+++ b/tests/scripts/options/dash-W
@@ -60,7 +60,7 @@ rmfiles('foo.x', 'bar.x');
 # Test -W on vpath-found files: it should take effect.
 # Savannah bug # 15341
 
-mkdir('x-dir');
+mkdir('x-dir', 0777);
 utouch(-20, 'x-dir/x');
 touch('y');
 
-- 
cgit v1.2.3