summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/ChangeLog82
-rwxr-xr-xtests/run_make_tests.pl3
-rw-r--r--tests/scripts/features/double_colon9
-rw-r--r--tests/scripts/features/errors19
-rw-r--r--tests/scripts/features/parallelism24
-rw-r--r--tests/scripts/features/patternrules3
-rw-r--r--tests/scripts/features/reinvoke17
-rw-r--r--tests/scripts/features/targetvars12
-rw-r--r--tests/scripts/features/varnesting47
-rw-r--r--tests/scripts/features/vpath365
-rw-r--r--tests/scripts/features/vpathplus1
-rw-r--r--tests/scripts/functions/call13
-rw-r--r--tests/scripts/functions/sort98
-rw-r--r--tests/scripts/functions/wildcard12
-rw-r--r--tests/scripts/options/dash-k1
-rw-r--r--tests/scripts/options/dash-n17
-rw-r--r--tests/scripts/targets/POSIX3
-rw-r--r--tests/scripts/variables/SHELL3
-rw-r--r--tests/scripts/variables/private12
-rw-r--r--tests/scripts/variables/special2
20 files changed, 134 insertions, 309 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index e2ada201..d036568e 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,85 +1,3 @@
-2011-11-14 Paul Smith <psmith@gnu.org>
-
- * scripts/features/double_colon: Check double-colon with escaped
- filenames. See Savannah bug #33399.
-
-2011-09-18 Paul Smith <psmith@gnu.org>
-
- * scripts/features/parallelism: On re-exec make sure we preserve
- the value of MAKEFLAGS when necessary. See Savannah bug #33873.
-
- * scripts/features/vpath3: Verify handling of -lfoo libraries
- found via vpath vs. the standard directory search.
- See Savannah bug #32511.
-
-2011-09-12 Paul Smith <psmith@gnu.org>
-
- * scripts/functions/call: Verify that using export in a $(call ...)
- context creates a global variable. See Savannah bug #32498.
-
-2011-09-02 Paul Smith <psmith@gnu.org>
-
- * scripts/options/dash-n: Verify that in "-n -t", the -n takes
- priority. Patch from Michael Witten <mfwitten@gmail.com>.
-
-2011-08-29 Paul Smith <psmith@gnu.org>
-
- * scripts/features/varnesting: Test resetting of variables while
- expanding them. See Savannah patch #7534
-
-2011-06-12 Paul Smith <psmith@gnu.org>
-
- * scripts/features/archives: Check archives with whitespace at the
- beginning, end, and extra in the middle.
- Another test for Savannah bug #30612.
-
-2011-05-07 Paul Smith <psmith@gnu.org>
-
- * scripts/variables/private: Ensure we skip private variables when
- appending. Test for Savannah bug #32872.
-
- * scripts/functions/wildcard: Verify wildcard used to test for
- file existence/non-existence.
-
-2011-05-02 Paul Smith <psmith@gnu.org>
-
- * scripts/functions/sort: Add a test for Savannah bug #33125.
-
-2011-04-17 David A. Wheeler <dwheeler@dwheeler.com>
-
- * scripts/features/shell_assignment: Regression for "!=" feature
-
-2010-11-06 Paul Smith <psmith@gnu.org>
-
- * scripts/features/targetvars: Fix known-good output for BS/NL changes.
- * scripts/functions/call: Ditto.
- * scripts/variables/special: Ditto.
-
- * scripts/misc/bs-nl: New test suite for backslash/newline testing.
-
-2010-08-29 Paul Smith <psmith@gnu.org>
-
- * scripts/features/errors: Add new error message to output text.
- * scripts/variables/SHELL: Ditto.
- * scripts/targets/POSIX: Ditto.
- * scripts/options/dash-k: Ditto.
- * scripts/features/vpathplus: Ditto.
- * scripts/features/patternrules: Ditto.
- * scripts/features/parallelism: Ditto.
-
-2010-08-13 Paul Smith <psmith@gnu.org>
-
- * scripts/features/archives: New regression tests for archive
- support. Test for fix to Savannah bug #30612.
-
- * run_make_tests.pl (set_more_defaults): Set a %FEATURES hash to
- the features available in $(.FEATURES).
-
-2010-08-10 Paul Smith <psmith@gnu.org>
-
- * scripts/features/reinvoke: Ensure command line variable settings
- are preserved across make re-exec. Tests Savannah bug #30723.
-
2010-07-28 Paul Smith <psmith@gnu.org>
* scripts/targets/POSIX: Compatibility issues with Solaris (and
diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl
index 7291c557..2c8c08b9 100755
--- a/tests/run_make_tests.pl
+++ b/tests/run_make_tests.pl
@@ -29,7 +29,6 @@
# You should have received a copy of the GNU General Public License along with
# this program. If not, see <http://www.gnu.org/licenses/>.
-%FEATURES = ();
$valgrind = 0; # invoke make with valgrind
$valgrind_args = '';
@@ -368,8 +367,6 @@ sub set_more_defaults
$parallel_jobs = 1;
}
- %FEATURES = map { $_ => 1 } split /\s+/, `sh -c "echo '\\\$(info \\\$(.FEATURES))' | $make_path -f- 2>/dev/null"`;
-
# Set up for valgrind, if requested.
if ($valgrind) {
diff --git a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon
index 1097775b..cad605db 100644
--- a/tests/scripts/features/double_colon
+++ b/tests/scripts/features/double_colon
@@ -151,14 +151,5 @@ two');
unlink('result','one','two');
-# TEST 10: check for proper backslash handling
-# Savannah bug #33399
-
-run_make_test('
-a\ xb :: ; @echo one
-a\ xb :: ; @echo two
-',
- '', "one\ntwo\n");
-
# This tells the test driver that the perl test script executed properly.
1;
diff --git a/tests/scripts/features/errors b/tests/scripts/features/errors
index 1e4be461..e372fe05 100644
--- a/tests/scripts/features/errors
+++ b/tests/scripts/features/errors
@@ -42,17 +42,15 @@ close(MAKEFILE);
unlink("cleanit");
$cleanit_error = `sh -c "$rm_command cleanit 2>&1"`;
-chomp $cleanit_error;
$delete_error_code = $? >> 8;
# TEST #1
# -------
-$answer = "$rm_command cleanit
-$cleanit_error
-$makefile:2: recipe for target `clean' failed
-$make_name: [clean] Error $delete_error_code (ignored)
-$rm_command foo\n";
+$answer = "$rm_command cleanit\n"
+ . $cleanit_error
+ ."$make_name: [clean] Error $delete_error_code (ignored)\n"
+ ."$rm_command foo\n";
&run_make_with_options($makefile,"",&get_logfile);
@@ -76,11 +74,10 @@ if (!$vos)
# TEST #2
# -------
-$answer = "$rm_command cleanit
-$cleanit_error
-$makefile:5: recipe for target `clean2' failed
-$make_name: [clean2] Error $delete_error_code (ignored)
-$rm_command foo\n";
+$answer = "$rm_command cleanit\n"
+ . $cleanit_error
+ ."$make_name: [clean2] Error $delete_error_code (ignored)\n"
+ ."$rm_command foo\n";
&run_make_with_options($makefile,"clean2 -i",&get_logfile);
diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism
index 909c9794..cc0f84f6 100644
--- a/tests/scripts/features/parallelism
+++ b/tests/scripts/features/parallelism
@@ -98,17 +98,14 @@ fail.1 fail.2 fail.3:
ok:
\@sleep 4
\@echo Ok done",
- '-rR -j5', "Fail
-#MAKEFILE#:6: recipe for target `fail.1' failed
+ '-rR -j5', 'Fail
#MAKE#: *** [fail.1] Error 1
#MAKE#: *** Waiting for unfinished jobs....
Fail
-#MAKEFILE#:6: recipe for target `fail.2' failed
#MAKE#: *** [fail.2] Error 1
Fail
-#MAKEFILE#:6: recipe for target `fail.3' failed
#MAKE#: *** [fail.3] Error 1
-Ok done",
+Ok done',
512);
@@ -167,23 +164,6 @@ inc.mk:
rmfiles('inc.mk');
-# TEST #11: Make sure -jN from MAKEFLAGS is processed even when we re-exec
-# See Savannah bug #33873
-
-$extraENV{MAKEFLAGS} = '-j4';
-
-run_make_test(q!
-things = thing1 thing2
-all: $(things)
-$(things):; @echo '$@ start'; sleep 1; echo '$@ end'
--include inc.mk
-inc.mk: ; @touch $@
-!,
- '', "thing1 start\nthing2 start\nthing1 end\nthing2 end\n");
-
-delete $extraENV{MAKEFLAGS};
-rmfiles('inc.mk');
-
if ($all_tests) {
# Implicit files aren't properly recreated during parallel builds
# Savannah bug #26864
diff --git a/tests/scripts/features/patternrules b/tests/scripts/features/patternrules
index 5cc6b94d..eebe7c0a 100644
--- a/tests/scripts/features/patternrules
+++ b/tests/scripts/features/patternrules
@@ -110,8 +110,7 @@ $(dir)/foo.bar:
',
"dir=$dir",
-"#MAKEFILE#:6: recipe for target `$dir/foo.bar' failed
-#MAKE#: *** [$dir/foo.bar] Error 1",
+"#MAKE#: *** [$dir/foo.bar] Error 1",
512);
unlink("$dir/foo.bar");
diff --git a/tests/scripts/features/reinvoke b/tests/scripts/features/reinvoke
index eb1a3492..9952ced1 100644
--- a/tests/scripts/features/reinvoke
+++ b/tests/scripts/features/reinvoke
@@ -57,24 +57,9 @@ include $(F)',
# Now try with the file we're not updating being the actual file we're
# including: this and the previous one test different parts of the code.
-run_make_test(undef, 'F=b', "[ -f b ] || echo >> b\nhello\n")
+run_make_test(undef, "F=b", "[ -f b ] || echo >> b\nhello\n")
&rmfiles('a','b','c');
-# Ensure command line variables are preserved properly across re-exec
-# Tests for Savannah bug #30723
-
-run_make_test('
-ifdef RECURSE
--include foo30723
-endif
-recurse: ; @$(MAKE) -f $(MAKEFILE_LIST) RECURSE=1 test
-test: ; @echo F.O=$(F.O)
-foo30723: ; @touch $@
-',
- '--no-print-directory F.O=bar', "F.O=bar\n");
-
-unlink('foo30723');
-
# This tells the test driver that the perl test script executed properly.
1;
diff --git a/tests/scripts/features/targetvars b/tests/scripts/features/targetvars
index a9b8dbeb..ddd6c1f5 100644
--- a/tests/scripts/features/targetvars
+++ b/tests/scripts/features/targetvars
@@ -237,20 +237,10 @@ a: ; @echo "$(FOO)"
run_make_test(undef, 'FOO=C', "C f1\n");
-# TEST #19: Conditional variables with command-line settings
-
-run_make_test('
-a: FOO ?= f1
-a: ; @echo "$(FOO)"
-',
- '', "f1\n");
-
-run_make_test(undef, 'FOO=C', "C\n");
-
# TEST #20: Check for continuation after semicolons
run_make_test(q!
-a: A = 'hello;\
+a: A = 'hello; \
world'
a: ; @echo $(A)
!,
diff --git a/tests/scripts/features/varnesting b/tests/scripts/features/varnesting
index d8f3ffbb..15d50711 100644
--- a/tests/scripts/features/varnesting
+++ b/tests/scripts/features/varnesting
@@ -1,30 +1,29 @@
-# -*-perl-*-
-$description = "Test recursive variables";
+$description = "The following test creates a makefile to ...";
$details = "";
-run_make_test('
-x = variable1
-variable2 := Hello
-y = $(subst 1,2,$(x))
-z = y
-a := $($($(z)))
-all:
- @echo $(a)
-',
- '', "Hello\n");
-
-# This tests resetting the value of a variable while expanding it.
-# You may only see problems with this if you're using valgrind or
-# some other memory checker that poisons freed memory.
-# See Savannah patch #7534
-
-run_make_test('
-VARIABLE = $(eval VARIABLE := echo hi)$(VARIABLE)
-wololo:
- @$(VARIABLE)
-',
- '', "hi\n");
+open(MAKEFILE,"> $makefile");
+
+# The Contents of the MAKEFILE ...
+
+print MAKEFILE "x = variable1\n"
+ ."variable2 := Hello\n"
+ ."y = \$(subst 1,2,\$(x))\n"
+ ."z = y\n"
+ ."a := \$(\$(\$(z)))\n"
+ ."all: \n"
+ ."\t\@echo \$(a)\n";
+
+# END of Contents of MAKEFILE
+
+close(MAKEFILE);
+
+&run_make_with_options($makefile,"",&get_logfile);
+
+# Create the answer to what should be produced by this Makefile
+$answer = "Hello\n";
+
+&compare_output($answer,&get_logfile(1));
1;
diff --git a/tests/scripts/features/vpath3 b/tests/scripts/features/vpath3
index c6ede282..978c5ee6 100644
--- a/tests/scripts/features/vpath3
+++ b/tests/scripts/features/vpath3
@@ -1,35 +1,50 @@
-# -*-perl-*-
+# -*-perl-*-
$description = "Test the interaction of the -lfoo feature and vpath";
$details = "";
-my @dirs_to_make = qw(a1 b1 a2 b2 b3);
-for my $d (@dirs_to_make) {
- mkdir($d, 0777);
-}
+open(MAKEFILE,"> $makefile");
+
+# The Contents of the MAKEFILE ...
+
+print MAKEFILE "vpath %.a a1\n";
+print MAKEFILE "vpath %.so b1\n";
+print MAKEFILE "vpath % a2 b2\n";
+print MAKEFILE "vpath % b3\n";
+print MAKEFILE "all: -l1 -l2 -l3; \@echo \$^\n";
+
+# END of Contents of MAKEFILE
+
+close(MAKEFILE);
+
+mkdir("a1", 0777);
+mkdir("b1", 0777);
+mkdir("a2", 0777);
+mkdir("b2", 0777);
+mkdir("b3", 0777);
+
+@files_to_touch = ("a1${pathsep}lib1.a",
+ "b1${pathsep}lib1.so",
+ "a2${pathsep}lib2.a",
+ "b2${pathsep}lib2.so",
+ "lib3.a",
+ "b3${pathsep}lib3.so");
-my @files_to_touch = ("a1${pathsep}lib1.a",
- "a1${pathsep}libc.a",
- "b1${pathsep}lib1.so",
- "a2${pathsep}lib2.a",
- "b2${pathsep}lib2.so",
- "lib3.a",
- "b3${pathsep}lib3.so");
&touch(@files_to_touch);
-run_make_test('
-vpath %.h b3
-vpath %.a a1
-vpath %.so b1
-vpath % a2 b2
-vpath % b3
-all: -l1 -lc -l2 -l3; @echo $^
-',
- '', "a1${pathsep}lib1.a a1${pathsep}libc.a a2${pathsep}lib2.a lib3.a\n");
-
-unlink(@files_to_touch);
-for my $d (@dirs_to_make) {
- rmdir($d);
+&run_make_with_options($makefile,"",&get_logfile);
+
+# Create the answer to what should be produced by this Makefile
+$answer = "a1${pathsep}lib1.a a2${pathsep}lib2.a lib3.a\n";
+
+if (&compare_output($answer,&get_logfile(1)))
+{
+ unlink @files_to_touch;
+ rmdir("a1");
+ rmdir("b1");
+ rmdir("a2");
+ rmdir("b2");
+ rmdir("b3");
}
1;
diff --git a/tests/scripts/features/vpathplus b/tests/scripts/features/vpathplus
index c95c8abc..a37fbedd 100644
--- a/tests/scripts/features/vpathplus
+++ b/tests/scripts/features/vpathplus
@@ -86,7 +86,6 @@ cat ${VP}foo.c bar.c > foo.b 2>/dev/null || exit 1
$answer = "not creating notarget.c from notarget.d
cat notarget.c > notarget.b 2>/dev/null || exit 1
-$makefile:16: recipe for target `notarget.b' failed
$make_name: *** [notarget.b] Error 1
";
diff --git a/tests/scripts/functions/call b/tests/scripts/functions/call
index 98f1d921..f3c54708 100644
--- a/tests/scripts/functions/call
+++ b/tests/scripts/functions/call
@@ -38,7 +38,7 @@ two = $(call one,$(1),foo,$(2))
DEP_foo = bar baz quux
DEP_baz = quux blarp
rest = $(wordlist 2,$(words ${1}),${1})
-tclose = $(if $1,$(firstword $1)\
+tclose = $(if $1,$(firstword $1) \
$(call tclose,$(sort ${DEP_$(firstword $1)} $(call rest,$1))))
all: ; @echo '$(call reverse,bar,foo)'; \
@@ -96,15 +96,4 @@ close(MAKEFILE);
$answer = "1 2 3 4 5 6 7 8 9\n1 2 3 4 5\n1 2 3\n1 2 3\n";
&compare_output($answer,&get_logfile(1));
-# Ensure that variables are defined in global scope even in a $(call ...)
-
-delete $ENV{X123};
-
-run_make_test('
-tst = $(eval export X123)
-$(call tst)
-all: ; @echo "$${X123-not set}"
-',
- '', "\n");
-
1;
diff --git a/tests/scripts/functions/sort b/tests/scripts/functions/sort
index b5589103..d472102d 100644
--- a/tests/scripts/functions/sort
+++ b/tests/scripts/functions/sort
@@ -1,47 +1,55 @@
-# -*-perl-*-
-
-$description = "The following test creates a makefile to verify
-the ability of make to sort lists of object. Sort
-will also remove any duplicate entries. This will also
-be tested.";
-
-$details = "The make file is built with a list of object in a random order
-and includes some duplicates. Make should sort all of the elements
-remove all duplicates\n";
-
-run_make_test('
-foo := moon_light days
-foo1:= jazz
-bar := captured
-bar2 = boy end, has rise A midnight
-bar3:= $(foo)
-s1 := _by
-s2 := _and_a
-t1 := $(addsuffix $(s1), $(bar) )
-t2 := $(addsuffix $(s2), $(foo1) )
-t3 := $(t2) $(t2) $(t2) $(t2) $(t2) $(t2) $(t2) $(t2) $(t2) $(t2)
-t4 := $(t3) $(t3) $(t3) $(t3) $(t3) $(t3) $(t3) $(t3) $(t3) $(t3)
-t5 := $(t4) $(t4) $(t4) $(t4) $(t4) $(t4) $(t4) $(t4) $(t4) $(t4)
-t6 := $(t5) $(t5) $(t5) $(t5) $(t5) $(t5) $(t5) $(t5) $(t5) $(t5)
-t7 := $(t6) $(t6) $(t6)
-p1 := $(addprefix $(foo1), $(s2) )
-blank:=
-all:
- @echo $(sort $(bar2) $(foo) $(addsuffix $(s1), $(bar) ) $(t2) $(bar2) $(bar3))
- @echo $(sort $(blank) $(foo) $(bar2) $(t1) $(p1) )
- @echo $(sort $(foo) $(bar2) $(t1) $(t4) $(t5) $(t7) $(t6) )
-',
- '', 'A boy captured_by days end, has jazz_and_a midnight moon_light rise
-A boy captured_by days end, has jazz_and_a midnight moon_light rise
-A boy captured_by days end, has jazz_and_a midnight moon_light rise
-');
-
-
-# Test with non-space/tab whitespace. Note that you can't see the
-# original bug except using valgrind.
-
-run_make_test("FOO = a b\tc\rd\fe \f \f \f \f \ff
-all: ; \@echo \$(words \$(sort \$(FOO)))\n",
- '', "5\n");
+$description = "The following test creates a makefile to verify\n"
+ ."the ability of make to sort lists of object. Sort\n"
+ ."will also remove any duplicate entries. This will also\n"
+ ."be tested.";
+
+$details = "The make file is built with a list of object in a random order\n"
+ ."and includes some duplicates. Make should sort all of the elements\n"
+ ."remove all duplicates\n";
+
+open(MAKEFILE,"> $makefile");
+
+# The Contents of the MAKEFILE ...
+
+print MAKEFILE "foo := moon_light days \n"
+ ."foo1:= jazz\n"
+ ."bar := captured \n"
+ ."bar2 = boy end, has rise A midnight \n"
+ ."bar3:= \$(foo)\n"
+ ."s1 := _by\n"
+ ."s2 := _and_a\n"
+ ."t1 := \$(addsuffix \$(s1), \$(bar) )\n"
+ ."t2 := \$(addsuffix \$(s2), \$(foo1) )\n"
+ ."t3 := \$(t2) \$(t2) \$(t2) \$(t2) \$(t2) \$(t2) \$(t2) \$(t2) \$(t2) \$(t2) \n"
+ ."t4 := \$(t3) \$(t3) \$(t3) \$(t3) \$(t3) \$(t3) \$(t3) \$(t3) \$(t3) \$(t3) \n"
+ ."t5 := \$(t4) \$(t4) \$(t4) \$(t4) \$(t4) \$(t4) \$(t4) \$(t4) \$(t4) \$(t4) \n"
+ ."t6 := \$(t5) \$(t5) \$(t5) \$(t5) \$(t5) \$(t5) \$(t5) \$(t5) \$(t5) \$(t5) \n"
+ ."t7 := \$(t6) \$(t6) \$(t6) \n"
+ ."p1 := \$(addprefix \$(foo1), \$(s2) )\n"
+ ."blank:= \n"
+ ."all:\n"
+ ."\t\@echo \$(sort \$(bar2) \$(foo) \$(addsuffix \$(s1), \$(bar) ) \$(t2) \$(bar2) \$(bar3))\n"
+ ."\t\@echo \$(sort \$(blank) \$(foo) \$(bar2) \$(t1) \$(p1) )\n"
+ ."\t\@echo \$(sort \$(foo) \$(bar2) \$(t1) \$(t4) \$(t5) \$(t7) \$(t6) )\n";
+
+
+# END of Contents of MAKEFILE
+
+close(MAKEFILE);
+
+&run_make_with_options($makefile,"",&get_logfile);
+
+# Create the answer to what should be produced by this Makefile
+$answer = "A boy captured_by days end, has jazz_and_a midnight moon_light rise\n"
+ ."A boy captured_by days end, has jazz_and_a midnight moon_light rise\n"
+ ."A boy captured_by days end, has jazz_and_a midnight moon_light rise\n";
+
+&compare_output($answer,&get_logfile(1));
1;
+
+
+
+
+
+
diff --git a/tests/scripts/functions/wildcard b/tests/scripts/functions/wildcard
index bcd84ad7..2841f5d5 100644
--- a/tests/scripts/functions/wildcard
+++ b/tests/scripts/functions/wildcard
@@ -88,16 +88,4 @@ all: ; @echo $(wildcard xz--y*.7)
!,
'', "\n");
-# TEST #5: wildcard used to verify file existence
-
-touch('xxx.yyy');
-
-run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
- '', "file=xxx.yyy\n");
-
-unlink('xxx.yyy');
-
-run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
- '', "file=\n");
-
1;
diff --git a/tests/scripts/options/dash-k b/tests/scripts/options/dash-k
index 40d9b973..d87a7861 100644
--- a/tests/scripts/options/dash-k
+++ b/tests/scripts/options/dash-k
@@ -92,7 +92,6 @@ close(MAKEFILE);
&run_make_with_options($makefile2, "-k", &get_logfile, $error_code);
$answer = "exit 1
-$makefile2:9: recipe for target `foo.o' failed
$make_name: *** [foo.o] Error 1
$make_name: Target `all' not remade because of errors.\n";
diff --git a/tests/scripts/options/dash-n b/tests/scripts/options/dash-n
index 248e0c87..de19f42c 100644
--- a/tests/scripts/options/dash-n
+++ b/tests/scripts/options/dash-n
@@ -65,21 +65,6 @@ $answer = "$make_name: `a' is up to date.\n";
$answer = "$make_name: `a' is up to date.\n";
&compare_output($answer, &get_logfile(1));
-# TEST 4
-
-unlink(qw(a b));
-
-&run_make_with_options($makefile2, "-t -n", &get_logfile);
-
-open(DASH_N_LOG, ">>" . &get_logfile(1));
-print DASH_N_LOG "a exists but should not!\n" if -e 'a';
-print DASH_N_LOG "b exists but should not!\n" if -e 'b';
-close(DASH_N_LOG);
-
-&compare_output("touch b\ntouch a\n", &get_logfile(1));
-
-# CLEANUP
-
-unlink(qw(a b c));
+unlink('a', 'b', 'c');
1;
diff --git a/tests/scripts/targets/POSIX b/tests/scripts/targets/POSIX
index 5f854be5..9c30e181 100644
--- a/tests/scripts/targets/POSIX
+++ b/tests/scripts/targets/POSIX
@@ -17,8 +17,7 @@ run_make_test(qq!
.POSIX:
all: ; \@$script
!,
- '', "#MAKEFILE#:3: recipe for target `all' failed
-#MAKE#: *** [all] Error $err\n", 512);
+ '', "#MAKE#: *** [all] Error $err\n", 512);
# User settings must override .POSIX
$flags = '-xc';
diff --git a/tests/scripts/variables/SHELL b/tests/scripts/variables/SHELL
index 4416ce13..7b7e7fef 100644
--- a/tests/scripts/variables/SHELL
+++ b/tests/scripts/variables/SHELL
@@ -81,7 +81,6 @@ run_make_test(qq!
.SHELLFLAGS = $flags
all: ; \@$script
!,
- '', "$out#MAKEFILE#:3: recipe for target `all' failed
-#MAKE#: *** [all] Error $err\n", 512);
+ '', "$out#MAKE#: *** [all] Error $err\n", 512);
1;
diff --git a/tests/scripts/variables/private b/tests/scripts/variables/private
index 17977455..b4baf5f2 100644
--- a/tests/scripts/variables/private
+++ b/tests/scripts/variables/private
@@ -75,16 +75,4 @@ a b: ; @echo $@=$(private)
',
'', "b=a\na=a\n");
-# 9: make sure private suppresses inheritence
-run_make_test(q!
-DEFS = FOO
-all: bar1
-bar1: private DEFS += 1
-bar3: private DEFS += 3
-bar1: bar2
-bar2: bar3
-bar1 bar2 bar3: ; @echo '$@: $(DEFS)'
-!,
- '', "bar3: FOO 3\nbar2: FOO\nbar1: FOO 1\n");
-
1;
diff --git a/tests/scripts/variables/special b/tests/scripts/variables/special
index 4637b2a2..a1e15c22 100644
--- a/tests/scripts/variables/special
+++ b/tests/scripts/variables/special
@@ -53,7 +53,7 @@ all:
# Test the .RECIPEPREFIX variable
&run_make_test('
define foo
-: foo-one\
+: foo-one \
foo-two
: foo-three
: foo-four
View Lorry Controller Status