From 014fead953b630560f308fe577cf5488f4c95bc0 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Fri, 22 Jan 2010 19:26:16 +0000
Subject: maint: ensure test independence from config macro format

* tests/cp/acl: Support USE_ACL not being defined.
* tests/mv/acl: Likewise. Also fix typo in skip message.
* tests/cp/preserve-slink-time: Support HAVE_UTIMENSAT being 0.
* tests/touch/no-dereference: Likewise.
* tests/ls/capability: Normalize so 1 is not required to be last char.
---
 tests/cp/acl                 | 2 +-
 tests/cp/preserve-slink-time | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/cp')

diff --git a/tests/cp/acl b/tests/cp/acl
index dc0c5cf78..010348a9d 100755
--- a/tests/cp/acl
+++ b/tests/cp/acl
@@ -30,7 +30,7 @@ fi
 require_acl_
 
 # Skip this test if cp was built without ACL support:
-grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null &&
+grep '^#define USE_ACL 1' $CONFIG_HEADER > /dev/null ||
   skip_test_ "insufficient ACL support"
 
 mkdir -p a b || framework_failure
diff --git a/tests/cp/preserve-slink-time b/tests/cp/preserve-slink-time
index cd01c895e..88c1016f8 100755
--- a/tests/cp/preserve-slink-time
+++ b/tests/cp/preserve-slink-time
@@ -23,8 +23,8 @@ fi
 
 . $srcdir/test-lib.sh
 
-grep '^#define HAVE_UTIMENSAT' "$CONFIG_HEADER" > /dev/null ||
-grep '^#define HAVE_LUTIMES' "$CONFIG_HEADER" > /dev/null ||
+grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null ||
+grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null ||
   skip_test_ 'this system lacks the utimensat function'
 
 ln -s no-such dangle || framework_failure
-- 
cgit v1.2.3-70-g09d2