Various fixes and updates from testers of the beta3 release (mostly Windows

and OS/2 changes).

3 files changed, 9 insertions, 9 deletions

diff --git a/tests/scripts/features/include b/tests/scripts/features/include
index 5030662..196a987 100644
--- a/tests/scripts/features/include
+++ b/tests/scripts/features/include
@@ -104,7 +104,7 @@ all:; @:
 
 foo: bar; @:
 
-bar:; @false
+bar:; @exit 1
 ', '', '');
 
 # Check include, sinclude, -include with no filenames.
diff --git a/tests/scripts/features/patternrules b/tests/scripts/features/patternrules
index c5bdf0a..1753d4d 100644
--- a/tests/scripts/features/patternrules
+++ b/tests/scripts/features/patternrules
@@ -23,22 +23,22 @@ a: void
 
 # 1 - existing file
 %.1: void
-	@false
+	@exit 1
 %.1: #MAKEFILE#
-	@true
+	@exit 0
 
 # 2 - phony
 %.2: void
-	@false
+	@exit 1
 %.2: 2.phony
-	@true
+	@exit 0
 .PHONY: 2.phony
 
 # 3 - implicit-phony
 %.3: void
-	@false
+	@exit 1
 %.3: 3.implicit-phony
-	@true
+	@exit 0
 
 3.implicit-phony:
 ',
@@ -110,7 +110,7 @@ $(dir)/foo.bar:
 
 ',
 "dir=$dir",
-"make: *** [$dir/foo.bar] Error 1",
+"#MAKE#: *** [$dir/foo.bar] Error 1",
 512);
 
 unlink("$dir/foo.bar");
diff --git a/tests/scripts/variables/SHELL b/tests/scripts/variables/SHELL
index 9ff5c4b..93c1872 100644
--- a/tests/scripts/variables/SHELL
+++ b/tests/scripts/variables/SHELL
@@ -6,7 +6,7 @@ $description = "Test proper handling of SHELL.";
 # but on other platforms who knows?
 $oshell = $ENV{SHELL};
 delete $ENV{SHELL};
-$mshell = `echo 'all:;\@echo \$(SHELL)' | $make_name -f-`;
+$mshell = `echo 'all:;\@echo \$(SHELL)' | $make_path -f-`;
 chop $mshell;
 
 # According to POSIX, the value of SHELL in the environment has no impact on