From d2516343bc5c105543b22eed3b073a8a4e14a659 Mon Sep 17 00:00:00 2001
From: Paul Smith <psmith@gnu.org>
Date: Mon, 28 Feb 2005 07:48:22 +0000
Subject: * New feature: -L option * New function: $(info ...) * Disallow
 $(eval ...) to create prereq relationships inside command scripts   (caused
 core dumps) * Try to allow more tests to succeed in Windows/DOS by sanitizing
 CRLF and \ * Various bug fixes and code cleanups (see the ChangeLog entry)

---
 tests/scripts/variables/MAKE          |  4 +++-
 tests/scripts/variables/MAKEFILE_LIST | 30 ------------------------------
 tests/scripts/variables/MFILE_LIST    | 30 ++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 31 deletions(-)
 delete mode 100644 tests/scripts/variables/MAKEFILE_LIST
 create mode 100644 tests/scripts/variables/MFILE_LIST

(limited to 'tests/scripts/variables')

diff --git a/tests/scripts/variables/MAKE b/tests/scripts/variables/MAKE
index 7c4cf0a..079c57e 100644
--- a/tests/scripts/variables/MAKE
+++ b/tests/scripts/variables/MAKE
@@ -1,3 +1,5 @@
+#								     -*-perl-*-
+
 $description = "The following test creates a makefile to test MAKE \n"
               ."(very generic)";
 
@@ -26,7 +28,7 @@ $answer = "$mkpath\n$mkpath -f $makefile foo\n"
 
 &run_make_with_options($makefile,"",&get_logfile,0);
 
-&delete("foo");
+&rmfiles("foo");
 # COMPARE RESULTS
 &compare_output($answer,&get_logfile(1));
 
diff --git a/tests/scripts/variables/MAKEFILE_LIST b/tests/scripts/variables/MAKEFILE_LIST
deleted file mode 100644
index 076e42d..0000000
--- a/tests/scripts/variables/MAKEFILE_LIST
+++ /dev/null
@@ -1,30 +0,0 @@
-#                                                                    -*-perl-*-
-
-$description = "Test the MAKEFILE_LIST variable.";
-
-$makefile2 = &get_tmpfile;
-
-open(MAKEFILE,"> $makefile");
-print MAKEFILE <<EOF;
-m1 := \$(MAKEFILE_LIST)
-include $makefile2
-m3 := \$(MAKEFILE_LIST)
-
-all:
-\t\@echo \$(m1)
-\t\@echo \$(m2)
-\t\@echo \$(m3)
-EOF
-close(MAKEFILE);
-
-
-open(MAKEFILE,"> $makefile2");
-print MAKEFILE "m2 := \$(MAKEFILE_LIST)\n";
-close(MAKEFILE);
-
-
-&run_make_with_options($makefile, "", &get_logfile);
-$answer = "$makefile\n$makefile $makefile2\n$makefile $makefile2\n";
-&compare_output($answer,&get_logfile(1));
-
-1;
diff --git a/tests/scripts/variables/MFILE_LIST b/tests/scripts/variables/MFILE_LIST
new file mode 100644
index 0000000..076e42d
--- /dev/null
+++ b/tests/scripts/variables/MFILE_LIST
@@ -0,0 +1,30 @@
+#                                                                    -*-perl-*-
+
+$description = "Test the MAKEFILE_LIST variable.";
+
+$makefile2 = &get_tmpfile;
+
+open(MAKEFILE,"> $makefile");
+print MAKEFILE <<EOF;
+m1 := \$(MAKEFILE_LIST)
+include $makefile2
+m3 := \$(MAKEFILE_LIST)
+
+all:
+\t\@echo \$(m1)
+\t\@echo \$(m2)
+\t\@echo \$(m3)
+EOF
+close(MAKEFILE);
+
+
+open(MAKEFILE,"> $makefile2");
+print MAKEFILE "m2 := \$(MAKEFILE_LIST)\n";
+close(MAKEFILE);
+
+
+&run_make_with_options($makefile, "", &get_logfile);
+$answer = "$makefile\n$makefile $makefile2\n$makefile $makefile2\n";
+&compare_output($answer,&get_logfile(1));
+
+1;
-- 
cgit v1.2.3