summaryrefslogtreecommitdiff
path: root/tests/scripts/features
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2005-12-13 14:44:17 +0000
committerPaul Smith <psmith@gnu.org>2005-12-13 14:44:17 +0000
commit4bd6db9df127f74a0fd957ddbda4743a9c22e053 (patch)
tree2ec15ebc521d725780732ffab329d7a154e742d9 /tests/scripts/features
parent3bcb608bdab1d3d24251548aac8bc33fc2fdad66 (diff)
downloadgunmake-4bd6db9df127f74a0fd957ddbda4743a9c22e053.tar.gz
Update the make.1 man page.
Use rm -f instead of rm in the test scripts. Fixes bug #15085.
Diffstat (limited to 'tests/scripts/features')
-rw-r--r--tests/scripts/features/errors24
-rw-r--r--tests/scripts/features/parallelism2
2 files changed, 13 insertions, 13 deletions
diff --git a/tests/scripts/features/errors b/tests/scripts/features/errors
index 253f50f..e372fe0 100644
--- a/tests/scripts/features/errors
+++ b/tests/scripts/features/errors
@@ -1,3 +1,5 @@
+# -*-perl-*-
+
$description = "The following tests the -i option and the '-' in front of \n"
."commands to test that make ignores errors in these commands\n"
."and continues processing.";
@@ -14,11 +16,11 @@ $details = "This test runs two makes. The first runs on a target with a \n"
if ($vos)
{
- $delete_command = "delete_file";
+ $rm_command = "delete_file";
}
else
{
- $delete_command = "rm";
+ $rm_command = "rm";
}
open(MAKEFILE,"> $makefile");
@@ -26,11 +28,11 @@ open(MAKEFILE,"> $makefile");
# The Contents of the MAKEFILE ...
print MAKEFILE "clean:\n"
- ."\t-$delete_command cleanit\n"
- ."\t$delete_command foo\n"
+ ."\t-$rm_command cleanit\n"
+ ."\t$rm_command foo\n"
."clean2: \n"
- ."\t$delete_command cleanit\n"
- ."\t$delete_command foo\n";
+ ."\t$rm_command cleanit\n"
+ ."\t$rm_command foo\n";
# END of Contents of MAKEFILE
@@ -39,16 +41,16 @@ close(MAKEFILE);
&touch("foo");
unlink("cleanit");
-$cleanit_error = `sh -c "$delete_command cleanit 2>&1"`;
+$cleanit_error = `sh -c "$rm_command cleanit 2>&1"`;
$delete_error_code = $? >> 8;
# TEST #1
# -------
-$answer = "$delete_command cleanit\n"
+$answer = "$rm_command cleanit\n"
. $cleanit_error
."$make_name: [clean] Error $delete_error_code (ignored)\n"
- ."$delete_command foo\n";
+ ."$rm_command foo\n";
&run_make_with_options($makefile,"",&get_logfile);
@@ -72,10 +74,10 @@ if (!$vos)
# TEST #2
# -------
-$answer = "$delete_command cleanit\n"
+$answer = "$rm_command cleanit\n"
. $cleanit_error
."$make_name: [clean2] Error $delete_error_code (ignored)\n"
- ."$delete_command foo\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 c75f436..6bde30f 100644
--- a/tests/scripts/features/parallelism
+++ b/tests/scripts/features/parallelism
@@ -18,11 +18,9 @@ if (!$parallel_jobs) {
}
if ($vos) {
- $delete_command = "delete_file -no_ask";
$sleep_command = "sleep -seconds";
}
else {
- $delete_command = "rm -f";
$sleep_command = "sleep";
}