test-meta.sh: change indentation to 4 spaces and fix if/for formatting.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
schacon · Mar 21, 2011 · 655872e · 655872e
1 parent 0f9c9ca
commit 655872e
Showing 1 changed file with 129 additions and 133 deletions.
diff --git a/t/test-meta.sh b/t/test-meta.sh
@@ -17,172 +17,168 @@ bup()
 
 genstat()
 {
-  (
-    export PATH="$TOP:$PATH" # pick up bup
-    # Skip atime (test elsewhere) to avoid the observer effect.
-    find . | sort | xargs bup xstat --exclude-fields ctime,atime
-  )
+    (
+        export PATH="$TOP:$PATH" # pick up bup
+        # Skip atime (test elsewhere) to avoid the observer effect.
+        find . | sort | xargs bup xstat --exclude-fields ctime,atime
+    )
 }
 
 actually-root()
 {
-  test "$(whoami)" == root -a -z "$FAKEROOTKEY"
+    test "$(whoami)" == root -a -z "$FAKEROOTKEY"
 }
 
 force-delete()
 {
-  if ! actually-root
-  then
-    rm -rf "$@"
-  else
-    # Go to greater lengths to deal with any test detritus.
-    for f in "$@"
-    do
-      test -e "$@" || continue
-      chattr -fR = "$@" || true
-      setfacl -Rb "$@"
-      rm -r "$@"
-    done
-  fi
+    if ! actually-root; then
+        rm -rf "$@"
+    else
+        # Go to greater lengths to deal with any test detritus.
+        for f in "$@"; do
+            test -e "$@" || continue
+            chattr -fR = "$@" || true
+            setfacl -Rb "$@"
+            rm -r "$@"
+        done
+    fi
 }
 
 test-src-create-extract()
 {
-  # Test bup meta create/extract for ./src -> ./src-restore.
-  # Also writes to ./src-stat and ./src-restore-stat.
-  (
-    (cd src && WVPASS genstat) > src-stat
-    WVPASS bup meta --create --recurse --file src.meta src
-    # Test extract.
-    force-delete src-restore
-    mkdir src-restore
-    cd src-restore
-    WVPASS bup meta --extract --file ../src.meta
-    WVPASS test -d src
-    (cd src && genstat >../../src-restore-stat) || WVFAIL
-    WVPASS diff -U5 ../src-stat ../src-restore-stat
-    # Test start/finish extract.
-    force-delete src
-    WVPASS bup meta --start-extract --file ../src.meta
-    WVPASS test -d src
-    WVPASS bup meta --finish-extract --file ../src.meta
-    (cd src && genstat >../../src-restore-stat) || WVFAIL
-    WVPASS diff -U5 ../src-stat ../src-restore-stat
-  )
+    # Test bup meta create/extract for ./src -> ./src-restore.
+    # Also writes to ./src-stat and ./src-restore-stat.
+    (
+        (cd src && WVPASS genstat) > src-stat
+        WVPASS bup meta --create --recurse --file src.meta src
+        # Test extract.
+        force-delete src-restore
+        mkdir src-restore
+        cd src-restore
+        WVPASS bup meta --extract --file ../src.meta
+        WVPASS test -d src
+        (cd src && genstat >../../src-restore-stat) || WVFAIL
+        WVPASS diff -U5 ../src-stat ../src-restore-stat
+        # Test start/finish extract.
+        force-delete src
+        WVPASS bup meta --start-extract --file ../src.meta
+        WVPASS test -d src
+        WVPASS bup meta --finish-extract --file ../src.meta
+        (cd src && genstat >../../src-restore-stat) || WVFAIL
+        WVPASS diff -U5 ../src-stat ../src-restore-stat
+    )
 }
 
-if actually-root
-then
-  umount "$TOP/bupmeta.tmp/testfs" || true
+if actually-root; then
+    umount "$TOP/bupmeta.tmp/testfs" || true
 fi
 
 force-delete "$BUP_DIR"
 force-delete "$TOP/bupmeta.tmp"
 
 # Create a test tree.
 (
-  mkdir -p "$TOP/bupmeta.tmp"
-  make DESTDIR="$TOP/bupmeta.tmp/src" install
-  mkdir "$TOP/bupmeta.tmp/src/misc"
-  cp -a cmd/bup-* "$TOP/bupmeta.tmp/src/misc/"
+    mkdir -p "$TOP/bupmeta.tmp"
+    make DESTDIR="$TOP/bupmeta.tmp/src" install
+    mkdir "$TOP/bupmeta.tmp/src/misc"
+    cp -a cmd/bup-* "$TOP/bupmeta.tmp/src/misc/"
 ) || WVFAIL
 
 # Use the test tree to check bup meta.
 WVSTART 'meta - general'
 (
-  cd "$TOP/bupmeta.tmp"
-  test-src-create-extract
+    cd "$TOP/bupmeta.tmp"
+    test-src-create-extract
 )
 
 # Root-only tests: ACLs, Linux attr, Linux xattr, etc.
-if actually-root
-then
-  (
-    cleanup_at_exit()
-    {
-      cd "$TOP"
-      umount "$TOP/bupmeta.tmp/testfs" || true
-    }
-
-    trap cleanup_at_exit EXIT
-
-    WVSTART 'meta - general (as root)'
-    WVPASS cd "$TOP/bupmeta.tmp"
-    umount testfs || true
-    dd if=/dev/zero of=testfs.img bs=1M count=32
-    mke2fs -F -j -m 0 testfs.img
-    mkdir testfs
-    mount -o loop,acl,user_xattr testfs.img testfs
-    # Hide, so that tests can't create risks.
-    chown root:root testfs
-    chmod 0700 testfs
-
-    cp -a src testfs/src
-    (cd testfs && test-src-create-extract)
-
-    WVSTART 'meta - atime (as root)'
-    force-delete testfs/src
-    mkdir testfs/src
+if actually-root; then
     (
-      mkdir testfs/src/foo
-      touch testfs/src/bar
-      PYTHONPATH="$TOP/lib" \
-        python -c "from bup.xstat import lutime, FSTime; \
-                   x = FSTime.from_secs(42);\
+        cleanup_at_exit()
+        {
+            cd "$TOP"
+            umount "$TOP/bupmeta.tmp/testfs" || true
+        }
+
+        trap cleanup_at_exit EXIT
+
+        WVSTART 'meta - general (as root)'
+        WVPASS cd "$TOP/bupmeta.tmp"
+        umount testfs || true
+        dd if=/dev/zero of=testfs.img bs=1M count=32
+        mke2fs -F -j -m 0 testfs.img
+        mkdir testfs
+        mount -o loop,acl,user_xattr testfs.img testfs
+        # Hide, so that tests can't create risks.
+        chown root:root testfs
+        chmod 0700 testfs
+
+        cp -a src testfs/src
+        (cd testfs && test-src-create-extract)
+
+        WVSTART 'meta - atime (as root)'
+        force-delete testfs/src
+        mkdir testfs/src
+        (
+            mkdir testfs/src/foo
+            touch testfs/src/bar
+            PYTHONPATH="$TOP/lib" \
+                python -c "from bup.xstat import lutime, FSTime; \
+                x = FSTime.from_secs(42);\
                    lutime('testfs/src/foo', (x, x));\
                    lutime('testfs/src/bar', (x, x));"
-      cd testfs
-      WVPASS bup meta -v --create --recurse --file src.meta src
-      bup meta -tvf src.meta
-      # Test extract.
-      force-delete src-restore
-      mkdir src-restore
-      cd src-restore
-      WVPASS bup meta --extract --file ../src.meta
-      WVPASSEQ "$(bup xstat --include-fields=atime src/foo)" "atime: 42"
-      WVPASSEQ "$(bup xstat --include-fields=atime src/bar)" "atime: 42"
-      # Test start/finish extract.
-      force-delete src
-      WVPASS bup meta --start-extract --file ../src.meta
-      WVPASS test -d src
-      WVPASS bup meta --finish-extract --file ../src.meta
-      WVPASSEQ "$(bup xstat --include-fields=atime src/foo)" "atime: 42"
-      WVPASSEQ "$(bup xstat --include-fields=atime src/bar)" "atime: 42"
-    )
-
-    WVSTART 'meta - Linux attr (as root)'
-    force-delete testfs/src
-    mkdir testfs/src
-    (
-      touch testfs/src/foo
-      mkdir testfs/src/bar
-      chattr +acdeijstuADST testfs/src/foo
-      chattr +acdeijstuADST testfs/src/bar
-      (cd testfs && test-src-create-extract)
-    )
-
-    WVSTART 'meta - Linux xattr (as root)'
-    force-delete testfs/src
-    mkdir testfs/src
-    (
-      touch testfs/src/foo
-      mkdir testfs/src/bar
-      attr -s foo -V bar testfs/src/foo
-      attr -s foo -V bar testfs/src/bar
-      (cd testfs && test-src-create-extract)
-    )
-
-    WVSTART 'meta - POSIX.1e ACLs (as root)'
-    force-delete testfs/src
-    mkdir testfs/src
-    (
-      touch testfs/src/foo
-      mkdir testfs/src/bar
-      setfacl -m u:root:r testfs/src/foo
-      setfacl -m u:root:r testfs/src/bar
-      (cd testfs && test-src-create-extract)
+            cd testfs
+            WVPASS bup meta -v --create --recurse --file src.meta src
+            bup meta -tvf src.meta
+            # Test extract.
+            force-delete src-restore
+            mkdir src-restore
+            cd src-restore
+            WVPASS bup meta --extract --file ../src.meta
+            WVPASSEQ "$(bup xstat --include-fields=atime src/foo)" "atime: 42"
+            WVPASSEQ "$(bup xstat --include-fields=atime src/bar)" "atime: 42"
+            # Test start/finish extract.
+            force-delete src
+            WVPASS bup meta --start-extract --file ../src.meta
+            WVPASS test -d src
+            WVPASS bup meta --finish-extract --file ../src.meta
+            WVPASSEQ "$(bup xstat --include-fields=atime src/foo)" "atime: 42"
+            WVPASSEQ "$(bup xstat --include-fields=atime src/bar)" "atime: 42"
+        )
+
+        WVSTART 'meta - Linux attr (as root)'
+        force-delete testfs/src
+        mkdir testfs/src
+        (
+            touch testfs/src/foo
+            mkdir testfs/src/bar
+            chattr +acdeijstuADST testfs/src/foo
+            chattr +acdeijstuADST testfs/src/bar
+            (cd testfs && test-src-create-extract)
+        )
+
+        WVSTART 'meta - Linux xattr (as root)'
+        force-delete testfs/src
+        mkdir testfs/src
+        (
+            touch testfs/src/foo
+            mkdir testfs/src/bar
+            attr -s foo -V bar testfs/src/foo
+            attr -s foo -V bar testfs/src/bar
+            (cd testfs && test-src-create-extract)
+        )
+
+        WVSTART 'meta - POSIX.1e ACLs (as root)'
+        force-delete testfs/src
+        mkdir testfs/src
+        (
+            touch testfs/src/foo
+            mkdir testfs/src/bar
+            setfacl -m u:root:r testfs/src/foo
+            setfacl -m u:root:r testfs/src/bar
+            (cd testfs && test-src-create-extract)
+        )
     )
-  )
 fi
 
 exit 0