* Fix PR/1394.

* Apply changes from Paul Eggert.
* Many other cleanups (index/rindex --> strchr/strrchr, etc.)
This commit is contained in:
Paul Smith
1999-10-15 07:00:58 +00:00
parent c71200d022
commit 3e26bde6db
27 changed files with 274 additions and 195 deletions

View File

@@ -1,3 +1,5 @@
# -*-perl-*-
$description = "This tests the CURDIR varaible.";
$details = "Echo CURDIR both with and without -C. Also ensure overrides work.";

View File

@@ -1,37 +1,34 @@
$description = "The following test creates a makefile to test ";
# -*-perl-*-
$description = "Test the MAKEFILES variable.";
$makefile2 = &get_tmpfile;
$makefile3 = &get_tmpfile;
open(MAKEFILE,"> $makefile");
# The Contents of the MAKEFILE ...
print MAKEFILE "MAKEFILES = work/MAKEFILES_variable.mk.2\n\n";
print MAKEFILE "all:\n";
print MAKEFILE "\t\@echo THIS IS THE DEFAULT RULE\n";
# END of Contents of MAKEFILE
print MAKEFILE 'all: ; @echo DEFAULT RULE: M2=$(M2) M3=$(M3)', "\n";
close(MAKEFILE);
open(MAKEFILE,"> $makefile2");
print MAKEFILE "NDEF:\n";
print MAKEFILE "\t\@echo THIS IS THE RULE FROM MAKEFILE 2\n";
print MAKEFILE <<EOF;
M2 = m2
NDEF: ; \@echo RULE FROM MAKEFILE 2
EOF
close(MAKEFILE);
&run_make_with_options($makefile,"",&get_logfile);
open(MAKEFILE,"> $makefile3");
print MAKEFILE <<EOF;
M3 = m3
NDEF3: ; \@echo RULE FROM MAKEFILE 3
EOF
close(MAKEFILE);
# Create the answer to what should be produced by this Makefile
$answer = "THIS IS THE DEFAULT RULE\n";
# COMPARE RESULTS
# In this call to compare output, you should use the call &get_logfile(1)
# to send the name of the last logfile created.
&run_make_with_options($makefile, "MAKEFILES='$makefile2 $makefile3'",
&get_logfile);
$answer = "DEFAULT RULE: M2=m2 M3=m3\n";
&compare_output($answer,&get_logfile(1));
# If you wish to stop if the compare fails, then add
# a "|| &error ("abort")" to the
# end of the previous line.
# This tells the test driver that the perl test script executed properly.
1;