* Fix PR/1394.

* Apply changes from Paul Eggert.
* Many other cleanups (index/rindex --> strchr/strrchr, etc.)

3 files changed, 26 insertions, 21 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 6c6387d..002b93c 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+1999-10-15  Paul D. Smith  <psmith@gnu.org>
+
+	* scripts/variables/MAKEFILES: This was really broken: it didn't
+	test anything at all, really.  Rewrote it, plus added a test for
+	PR/1394.
+
 1999-10-13  Paul D. Smith  <psmith@gnu.org>
 
 	* scripts/options/dash-n: Add a test for PR/1379: "-n doesn't
diff --git a/tests/scripts/variables/CURDIR b/tests/scripts/variables/CURDIR
index a4054bc..ee7cacb 100644
--- a/tests/scripts/variables/CURDIR
+++ b/tests/scripts/variables/CURDIR
@@ -1,3 +1,5 @@
+#                                                                    -*-perl-*-
+
 $description = "This tests the CURDIR varaible.";
 
 $details = "Echo CURDIR both with and without -C.  Also ensure overrides work.";
diff --git a/tests/scripts/variables/MAKEFILES b/tests/scripts/variables/MAKEFILES
index d42909c..3be284b 100644
--- a/tests/scripts/variables/MAKEFILES
+++ b/tests/scripts/variables/MAKEFILES
@@ -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);
-
-
-# Create the answer to what should be produced by this Makefile
-$answer = "THIS IS THE DEFAULT RULE\n";
 
-# COMPARE RESULTS
+open(MAKEFILE,"> $makefile3");
+print MAKEFILE <<EOF;
+M3 = m3
+NDEF3: ; \@echo RULE FROM MAKEFILE 3
+EOF
+close(MAKEFILE);
 
-# 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;