From d96a863cf5131c71a19ab88c683c7251de22b598 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Thu, 13 Sep 2007 12:13:35 +0200
Subject: Enable some previously omitted test scripts.  Add a test cross-check.

* tests/rm/Makefile.am (TESTS): Add empty-name and unreadable.
* tests/rm/empty-name: Likewise.
* tests/rm/unreadable: Reenable this test.  Adjust for new rm.
* tests/mkdir/Makefile.am: Add writable-under-readonly.
* tests/mkdir/writable-under-readonly: Add some comments.
This test is always skipped, for now.
* tests/Makefile.am (ta): Hook up the new root-only script.
* tests/tail-2/infloop-1: Make this test pass.
* tests/tail-2/Makefile.am (TESTS): Add infloop-1.
* tests/tail-2/fflush: Remove unused file.
* tests/check.mk (vc_executable_is_in_TESTS): More portable.
* tests/check.mk (check): Depend on the above.
* build-aux/check.mk: Remove comment mentioning AUTHORS file.
---
 tests/rm/unreadable | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/rm/unreadable')

diff --git a/tests/rm/unreadable b/tests/rm/unreadable
index c5b9c9877..66a59515c 100755
--- a/tests/rm/unreadable
+++ b/tests/rm/unreadable
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test "rm" and unreadable directories.
 
-# Copyright (C) 1998, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2003, 2005-2007 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,12 +43,12 @@ my @Tests =
     (
      # test-name options input expected-output
      #
-     ['unreadable-1', '-rf', $d,
-      {EXIT => 1}, {ERR => "$prog: $d/.: Permission denied\n"}, $mkdir],
+     # Removing an empty, unwritable directory succeeds.
+     ['unreadable-1', '-rf', $d, {EXIT => 0}, $mkdir],
+
      ['unreadable-2', '-rf', $d,
       {EXIT => 1},
-      {ERR => "$prog: $d/.: Permission denied\n" .
-       "$prog: cannot remove directory `$d': File exists\n"},
+      {ERR => "$prog: cannot remove \`$d': Permission denied\n"},
       {PRE => sub { (mkdir $d,0700 and mkdir "$d/x",0700 and chmod 0100,$d)
                     or die "$d: $!\n"}} ],
     );
-- 
cgit v1.2.3-54-g00ecf