From: Rob Browning <rlb@defaultvalue.org>
Date: Fri, 7 Jun 2013 05:22:58 +0000 (-0500)
Subject: Fix completely broken invocations of t/root-status.
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=91b23d50390bc555063a0c6863b31b19b3fd99dc;p=packages%2Fb%2Fbup.git

Fix completely broken invocations of t/root-status.

No idea what I was thinking.

Thanks to Sascha Silbe <sascha-ml-reply-to-2013-2@silbe.org> for the
report.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/t/test-index-check-device.sh b/t/test-index-check-device.sh
index 2484fd0..0ffc3b8 100755
--- a/t/test-index-check-device.sh
+++ b/t/test-index-check-device.sh
@@ -4,7 +4,7 @@
 
 set -ex -o pipefail
 
-if t/root-status != root; then
+if [ $(t/root-status) != root ]; then
     echo 'Not root: skipping --check-device tests.'
     exit 0 # FIXME: add WVSKIP.
 fi
diff --git a/t/test-meta.sh b/t/test-meta.sh
index 964a50f..076f619 100755
--- a/t/test-meta.sh
+++ b/t/test-meta.sh
@@ -82,7 +82,7 @@ test-src-save-restore()
 
 universal-cleanup()
 {
-    if t/root-status != root; then return 0; fi
+    if [ $(t/root-status) != root ]; then return 0; fi
     cd "$TOP"
     umount "$TOP/bupmeta.tmp/testfs" || true
     umount "$TOP/bupmeta.tmp/testfs-limited" || true
@@ -374,7 +374,7 @@ WVSTART 'meta --edit'
 
 # Test ownership restoration (when not root or fakeroot).
 (
-    if t/root-status != none; then
+    if [ $(t/root-status) != none ]; then
         exit 0
     fi
 
@@ -440,7 +440,7 @@ WVSTART 'meta --edit'
 
 # Test ownership restoration (when root or fakeroot).
 (
-    if t/root-status == none; then
+    if [ $(t/root-status) == none ]; then
         exit 0
     fi
 
@@ -529,7 +529,7 @@ WVSTART 'meta --edit'
 
 # Root-only tests that require an FS with all the trimmings: ACLs,
 # Linux attr, Linux xattr, etc.
-if t/root-status == root; then
+if [ $(t/root-status) == root ]; then
     (
         set -e
         # Some cleanup handled in universal-cleanup() above.