From 304ac556eff640b7268f2fb7be490fba4a8df697 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 3 Jun 2012 15:18:01 -0500 Subject: [PATCH] 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 Reviewed-by: Zoran Zaric --- Makefile | 3 +-- t/test-meta.sh | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 172dab3..d70ed63 100644 --- 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 1983b10..fe1382f 100755 --- 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" -- 2.39.2