Imported Upstream version 4.4

[platform/upstream/make.git] / tests / scripts / features / vpathplus

diff --git a/tests/scripts/features/vpathplus b/tests/scripts/features/vpathplus
index 978aecb..da16983 100644 (file)
--- a/tests/scripts/features/vpathplus
+++ b/tests/scripts/features/vpathplus
@@ -5,13 +5,23 @@ $details = "";
 
 $VP = "$workdir$pathsep";
 
-open(MAKEFILE,"> $makefile");
+@touchedfiles = ();
+
+$off = -500;
 
-# The Contents of the MAKEFILE ...
+sub touchfiles {
+  foreach (@_) {
+    &utouch($off, $_);
+    $off += 10;
+    push(@touchedfiles, $_);
+  }
+}
 
-print MAKEFILE "VPATH = $VP\n";
+&touchfiles("$VP/foo.d", "$VP/bar.d", "$VP/foo.c", "$VP/bar.c", "foo.b", "bar.d");
 
-print MAKEFILE <<'EOMAKE';
+# Run the general-case test
+
+run_make_test(qq!VPATH = $VP! . q!
 .SUFFIXES: .a .b .c .d
 .PHONY: general rename notarget intermediate
 
@@ -20,12 +30,9 @@ print MAKEFILE <<'EOMAKE';
 %.c:
 %.d:
 
-%.a : %.b
-       cat $^ > $@
-%.b : %.c
-       cat $^ > $@ 2>/dev/null || exit 1
-%.c :: %.d
-       cat $^ > $@
+%.a : %.b ; cat $^ > $@
+%.b : %.c ; cat $^ > $@ 2>/dev/null || exit 1
+%.c :: %.d ; cat $^ > $@
 
 # General testing info:
 
@@ -39,71 +46,32 @@ rename: $(VPATH)/foo.c foo.d
 # Target not made testing info:
 
 notarget: notarget.b
-notarget.c: notarget.d
-       -@echo "not creating $@ from $^"
+notarget.c: notarget.d ; -@echo "not creating $@ from $^"
 
 # Intermediate files:
 
 intermediate: inter.a
-
-EOMAKE
-
-close(MAKEFILE);
-
-@touchedfiles = ();
-
-$off = -500;
-
-sub touchfiles {
-  foreach (@_) {
-    &utouch($off, $_);
-    $off += 10;
-    push(@touchedfiles, $_);
-  }
-}
-
-# Run the general-case test
-
-&touchfiles("$VP/foo.d", "$VP/bar.d", "$VP/foo.c", "$VP/bar.c", "foo.b", "bar.d");
-
-&run_make_with_options($makefile,"general",&get_logfile);
+!,
+    'general', "cat bar.d > bar.c\ncat ${VP}foo.c bar.c > foo.b 2>/dev/null || exit 1\n");
 
 push(@touchedfiles, "bar.c");
 
-$answer = "cat bar.d > bar.c
-cat ${VP}foo.c bar.c > foo.b 2>/dev/null || exit 1
-";
-&compare_output($answer,&get_logfile(1));
-
 # Test rules that don't make the target correctly
 
 &touchfiles("$VP/notarget.c", "notarget.b", "notarget.d");
 
-&run_make_with_options($makefile,"notarget",&get_logfile,512);
-
-$answer = "not creating notarget.c from notarget.d
-cat notarget.c > notarget.b 2>/dev/null || exit 1
-$make_name: *** [$makefile:13: notarget.b] Error 1
-";
-
-&compare_output($answer,&get_logfile(1));
+run_make_test(undef, 'notarget', "not creating notarget.c from notarget.d\ncat notarget.c > notarget.b 2>/dev/null || exit 1\n#MAKE#: *** [#MAKEFILE#:11: notarget.b] Error 1\n", 512);
 
 # Test intermediate file handling (part 1)
 
 &touchfiles("$VP/inter.d");
 
-&run_make_with_options($makefile,"intermediate",&get_logfile);
-
-push(@touchedfiles, "inter.a", "inter.b");
-
 my $be = pack("L", 1) eq pack("N", 1);
 my $intfiles = $be ? "inter.c inter.b" : "inter.b inter.c";
-$answer = "cat ${VP}inter.d > inter.c
-cat inter.c > inter.b 2>/dev/null || exit 1
-cat inter.b > inter.a
-rm $intfiles
-";
-&compare_output($answer,&get_logfile(1));
+
+run_make_test(undef, 'intermediate', "cat ${VP}inter.d > inter.c\ncat inter.c > inter.b 2>/dev/null || exit 1\ncat inter.b > inter.a\nrm $intfiles\n");
+
+push(@touchedfiles, "inter.a", "inter.b");
 
 # Test intermediate file handling (part 2)
 
@@ -111,21 +79,10 @@ rm $intfiles
 &utouch(-10, "$VP/inter.b");
 &touch("$VP/inter.d");
 
-push(@touchedfiles, "$VP/inter.b", "$VP/inter.d");
-
-&run_make_with_options($makefile,"intermediate",&get_logfile);
+run_make_test(undef, 'intermediate', "cat ${VP}inter.d > inter.c\ncat inter.c > inter.b 2>/dev/null || exit 1\ncat inter.b > inter.a\nrm inter.c\n");
 
-$answer = "cat ${VP}inter.d > inter.c
-cat inter.c > inter.b 2>/dev/null || exit 1
-cat inter.b > inter.a
-rm inter.c
-";
-&compare_output($answer,&get_logfile(1));
+push(@touchedfiles, "$VP/inter.b", "$VP/inter.d");
 
 unlink @touchedfiles unless $keep;
 
 1;
-
-### Local Variables:
-### eval: (setq whitespace-action (delq 'auto-cleanup whitespace-action))
-### End: