* tests/defs.in: Handle required=ro-dir.

* tests/destdir.test: Use this.

diff --git a/ChangeLog b/ChangeLog
index 8092afaded3e2a44c414f794ca84e92f86de1c62..61cf6b3f79f6130a996f36414811a5b5fa4938e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-20  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * tests/defs.in: Handle required=ro-dir.
+       * tests/destdir.test: Use this.
+
 2003-02-19  Richard Dawe  <rich@phekda.freeserve.co.uk>
 
        * lib/am/distdir.am (distcheck): Strip any leading DOS drive

diff --git a/tests/defs.in b/tests/defs.in
index 08e9c788b04bd2cfd779198895a9bf17b5205d55..b82f4eb9d48b683fbe9c2e5a7122b609af1225b8 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -122,6 +122,17 @@ then
        echo "$me: running python -V"
        ( python -V ) || exit 77
        ;;
+      ro-dir)
+       # Skip this test case if read-only directories aren't supported
+       # (e.g., under DOS.)
+       ro_dir_temp=ro_dir.$$
+       mkdir $ro_dir_temp || exit 1
+       chmod a-w $ro_dir_temp || exit 1
+       (: > $ro_dir_temp/probe) >/dev/null 2>/dev/null
+       create_status=$?
+       rm -rf $ro_dir_temp
+       test $create_status = 0 && exit 77
+       ;;
       tex)
         # No all versions of Tex support `--version', so we use
         # a configure check.

diff --git a/tests/destdir.test b/tests/destdir.test
index ee943731c69acc949d8fbad34aa931d88d3c762b..59e23604c70d87de1ba45f37a8fcbb7dfe0439a7 100755 (executable)
--- a/tests/destdir.test
+++ b/tests/destdir.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -21,9 +21,9 @@
 # Make sure that `make distcheck' can find some $(DESTDIR) omissions.
 # PR/186.
 
-# The feature we test here relies on read-only files.
+# The feature we test here relies on read-only directories.
 # It will only work for non-root users.
-required='non-root'
+required='ro-dir'
 
 . ./defs || exit 1