Always run metadata tests; disable root-level tests when not on Linux.

Disable the root-level test-meta.sh tests when the uname output
doesn't match Linux since they're not likely to work elsewhere right
now.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Reviewed-by: Zoran Zaric <zz@zoranzaric.de>

diff --git a/Makefile b/Makefile
index 172dab38bba796c51e3830265a09d036c8574199..d70ed637a6801a59f9bcd40a7e0683fe676e1544 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -82,12 +82,11 @@ runtests-python:
        $(PYTHON) wvtest.py \
                $(wildcard t/t*.py) \
                $(filter-out lib/bup/t/tmetadata.py,$(wildcard lib/*/t/t*.py))
-       [ -z "$(TEST_META)" ] || \
        $(PYTHON) wvtest.py lib/bup/t/tmetadata.py
 
 runtests-cmdline: all
        t/test.sh
-       [ -z "$(TEST_META)" ] || t/test-meta.sh
+       t/test-meta.sh
 
 stupid:
        PATH=/bin:/usr/bin $(MAKE) test

diff --git a/t/test-meta.sh b/t/test-meta.sh
index 1983b10d8940bb5e66f316b3176de269b06c2196..fe1382ffcfeb73397ac57997fb9b4ca80a214405 100755 (executable)
--- a/t/test-meta.sh
+++ b/t/test-meta.sh
@@ -103,6 +103,10 @@ WVSTART 'meta - general'
 # Root-only tests: ACLs, Linux attr, Linux xattr, etc.
 if actually-root; then
     (
+        # These tests are only likely to work under Linux for now
+        # (patches welcome).
+        [[ $(uname) =~ Linux ]] || exit 0
+
         cleanup_at_exit()
         {
             cd "$TOP"