Fix make.h preprocessor directive to work better with Windows compilers.

Fix some regression tests to (hopefully) work better on Windows.

4 files changed, 30 insertions, 18 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 84f40f6..5e1f948 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-29  Paul D. Smith  <psmith@gnu.org>
+
+	* scripts/functions/abspath: Add some text to the error messages
+	to get a better idea of what's wrong.  Make warnings instead of
+	errors.
+
+	* scripts/features/patspecific_vars: Don't use "test", which is
+	UNIX specific.  Print the values and let the test script match
+	them.
+
 2005-08-25  Paul Smith  <psmith@gnu.org>
 
 	* scripts/variables/SHELL: Use a /./ prefix instead of //: the
diff --git a/tests/scripts/features/patspecific_vars b/tests/scripts/features/patspecific_vars
index 9e98b43..20c1cfc 100644
--- a/tests/scripts/features/patspecific_vars
+++ b/tests/scripts/features/patspecific_vars
@@ -67,8 +67,8 @@ run_make_test('
 /%: export foo := foo
 
 /bar:
-	@test "$(foo)" = "$$foo"
-', '', '');
+	@echo $(foo) $$foo
+', '', 'foo foo');
 
 
 # TEST #6 -- test expansion of pattern-specific simple variables
diff --git a/tests/scripts/functions/abspath b/tests/scripts/functions/abspath
index d419255..84c30ab 100644
--- a/tests/scripts/functions/abspath
+++ b/tests/scripts/functions/abspath
@@ -5,68 +5,68 @@ $details = "";
 
 run_make_test('
 ifneq ($(realpath $(abspath .)),$(CURDIR))
-  $(error )
+  $(warning .: abs="$(abspath .)" real="$(realpath $(abspath .))" curdir="$(CURDIR)")
 endif
 
 ifneq ($(realpath $(abspath ./)),$(CURDIR))
-  $(error )
+  $(warning ./: abs="$(abspath ./)" real="$(realpath $(abspath ./))" curdir="$(CURDIR)")
 endif
 
 ifneq ($(realpath $(abspath .///)),$(CURDIR))
-  $(error )
+  $(warning .///: abs="$(abspath .///)" real="$(realpath $(abspath .///))" curdir="$(CURDIR)")
 endif
 
 ifneq ($(abspath /),/)
-  $(error )
+  $(warning /: abspath="$(abspath /)")
 endif
 
 ifneq ($(abspath ///),/)
-  $(error )
+  $(warning ///: abspath="$(abspath ///)")
 endif
 
 ifneq ($(abspath /.),/)
-  $(error )
+  $(warning /.: abspath="$(abspath /.)")
 endif
 
 ifneq ($(abspath ///.),/)
-  $(error )
+  $(warning ///.: abspath="$(abspath ///.)")
 endif
 
 ifneq ($(abspath /./),/)
-  $(error )
+  $(warning /./: abspath="$(abspath /./)")
 endif
 
 ifneq ($(abspath /.///),/)
-  $(error )
+  $(warning /.///: abspath="$(abspath /.///)")
 endif
 
 ifneq ($(abspath /..),/)
-  $(error )
+  $(warning /..: abspath="$(abspath /..)")
 endif
 
 ifneq ($(abspath ///..),/)
-  $(error )
+  $(warning ///..: abspath="$(abspath ///..)")
 endif
 
 ifneq ($(abspath /../),/)
-  $(error )
+  $(warning /../: abspath="$(abspath /../)")
 endif
 
 ifneq ($(abspath /..///),/)
-  $(error )
+  $(warning /..///: abspath="$(abspath /..///)")
 endif
 
 
 ifneq ($(abspath /foo/bar/..),/foo)
-  $(error )
+  $(warning /foo/bar/..: abspath="$(abspath /foo/bar/..)")
 endif
 
 ifneq ($(abspath /foo/bar/../../../baz),/baz)
-  $(error )
+  $(warning /foo/bar/../../../baz: abspath="$(abspath /foo/bar/../../../baz)")
 endif
 
 ifneq ($(abspath /foo/bar/../ /..),/foo /)
-  $(error )
+  $(warning /foo/bar/../ /..: abspath="$(abspath /foo/bar/../ /..)")
 endif
 
 
diff --git a/tests/scripts/options/dash-I b/tests/scripts/options/dash-I
index 0be0bd7..8dc5d9b 100644
--- a/tests/scripts/options/dash-I
+++ b/tests/scripts/options/dash-I
@@ -1,3 +1,5 @@
+#                                                                    -*-perl-*-
+
 $description ="The following test creates a makefile to test the -I option.";
 
 $details = "\