From 9eb6a5986a8cde7ed659d13c7f632baec4894873 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
Date: Tue, 4 Mar 2008 14:28:54 -0700
Subject: [PATCH] Ignore tests that require read-only directories under root.

* tests/torture.at (AT_CHECK_CONFIG_CREATION_NOWRITE): Skip
no-write portion if user has root-like privileges.

Signed-off-by: Eric Blake <ebb9@byu.net>
---
 ChangeLog        |  6 ++++++
 tests/torture.at | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0bb35a93..d4e3b03c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-04  Eric Blake  <ebb9@byu.net>
+
+	Ignore tests that require read-only directories under root.
+	* tests/torture.at (AT_CHECK_CONFIG_CREATION_NOWRITE): Skip
+	no-write portion if user has root-like privileges.
+
 2008-03-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* lib/autotest/general.m4 (AT_INIT): Fix detection of '-C -'.
diff --git a/tests/torture.at b/tests/torture.at
index 58785aee..d8ae8f36 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -211,9 +211,17 @@ AT_CHECK([grep OK $1], [], [OK
 AT_CHECK_CONFIGURE([what_to_test=var-$1 --no-create])
 # config.status might be stupidly expecting data on stdin, if it's
 # really broken...
+# Skip check if user can rename files into a read-only directory (when
+# run by root or on w32).
+touch t
 chmod a-w .
-AT_CHECK([./config.status var-$1 </dev/null], [1], [ignore], [ignore])
+if mv t t1 >/dev/null 2>&1 ; then
+  :
+else
+  AT_CHECK([./config.status var-$1 </dev/null], [1], [ignore], [ignore])
+fi
 chmod u+w .
+rm -rf t t1
 ])# AT_CHECK_CONFIG_CREATION_NOWRITE
 
 
-- 
2.47.2