X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=tests%2Ftest-imagex-ntfs;h=45404d17a15a0dfdd50f1adabe91e00811465009;hp=3b4d5a1454695123ffee4b72ff61b0011c99a47e;hb=a5e30a05b4d7f02c57cc8fbb18e22d6fe31a79a0;hpb=a05f5ab4d86d5c66896525186fd7482921d5ea9e

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 3b4d5a14..45404d17 100755
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script does some sanity testing of the 'imagex' program, specifically
 # checking the NTFS capture and apply features.
@@ -9,19 +9,20 @@
 # remain mounted.
 
 set -e
-srcdir=`realpath $srcdir`
 cd tests
+. tests-common.sh
 
 imagex() {
 	../imagex $@ > /dev/null
 }
 
 __do_unmount() {
-	if !  fusermount -u $1; then
+	if !  fusermount -z -u $1; then
 		error "Failed to unmount \"$1\""
 	fi
 
 }
+
 do_unmount() {
 	if mountpoint $1 &> /dev/null; then
 		__do_unmount $1
@@ -30,8 +31,15 @@ do_unmount() {
 
 __do_mount() {
 	options="$3"
-	if ! ntfs-3g ${options:+-o $options} $1 $2; then
-		error "Could not mount NTFS volume \"$1\" on \"$2\".  Make sure ntfs-3g is installed."
+	if [ -z "$options" ]; then
+		options="no_def_opts,silent"
+	else
+		options="$options,no_def_opts,silent"
+	fi
+	if ! ntfs-3g -o $options $1 $2; then
+		error "Could not mount NTFS volume \"$1\" on \"$2\"!  Make sure ntfs-3g is "\
+		      "installed, and that you are either running the tests as root or have ntfs-3g "\
+		      "installed setuid root, so that we can mount a NTFS volume."
 	fi
 }
 
@@ -42,7 +50,7 @@ do_mount() {
 
 do_mkntfs() {
 	if ! mkntfs --force --fast $1 &> /dev/null; then
-		error "Could not create NTFS volume on \"$1\".  Make sure ntfs-3g / ntfsprogs are installed"
+		error "Could not create NTFS volume \"$1\"!  Make sure ntfsprogs are installed."
 	fi
 }
 
@@ -67,7 +75,10 @@ cleanup() {
 error() {
 	echo "****************************************************************"
 	echo "                         Test failure                           "
-	echo $*
+	while [ $# -gt 0 ]; do
+		echo $1
+		shift
+	done
 	echo "****************************************************************"
 	exit 1
 }
@@ -88,7 +99,7 @@ do_test() {
 	if [ -x /usr/bin/tree ]; then
 		tree in.mnt --inodes -F -s --noreport
 	fi
-	if ! ./ntfs-cmp in.mnt out.mnt; then
+	if ! ./tree-cmp in.mnt out.mnt NTFS; then
 		if [ -x /usr/bin/tree ]; then
 			echo "Dumping tree of applied image"
 			tree out.mnt --inodes -F -s --noreport
@@ -100,7 +111,9 @@ do_test() {
 	__do_unmount out.mnt
 }
 msg() {
-	echo "Testing image capture and application of $1"
+	echo "--------------------------------------------------------------------"
+	echo "Testing image capture and application of NTFS volume containing $1"
+	echo "--------------------------------------------------------------------"
 }
 
 cleanup
@@ -109,122 +122,122 @@ init
 msg "Empty NTFS volume"
 do_test ""
 
-msg "NTFS volume containing a single file"
+msg "a single file"
 do_test "echo 1 > file"
 
-msg "NTFS volume containing a single directory"
+msg "a single directory"
 do_test "mkdir dir"
 
-msg "NTFS volume containing subdirectory with file"
+msg "subdirectory with file"
 do_test "mkdir dir; echo 1 > dir/file"
 
-msg "NTFS volume containing empty file"
+msg "empty file"
 do_test "echo -n > empty_file"
 
-msg "NTFS volume containing two empty files"
+msg "two empty files"
 do_test "echo -n > empty_file_1; echo -n > empty_file_2"
 
-msg "NTFS volume containing hard link in same directory"
+msg "hard link in same directory"
 do_test "echo 1 > file; ln file link"
 
-msg "NTFS volume containing hard link between empty files"
+msg "hard link between empty files"
 do_test "echo -n > empty_file; ln empty_file link"
 
-msg "NTFS volume containing relative symbolic link"
+msg "relative symbolic link"
 do_test "echo 1 > file; ln -s file symlink"
 
-msg "NTFS volume containing absolute symbolic link"
+msg "absolute symbolic link"
 do_test "echo 1 > file; ln -s /some/absolute/target symlink"
 
-msg "NTFS volume containing large file"
+msg "large file"
 do_test "dd if=/dev/zero of=file bs=4096 count=10 &> /dev/null"
 
-msg "NTFS volume containing file with DOS name"
+msg "file with DOS name"
 do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file"
 
-msg "NTFS volume containing file with DOS name with alphabetically smaller hardlink in same directory"
+msg "file with DOS name with alphabetically smaller hardlink in same directory"
 do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file; ln file aaa_link"
 
-msg "NTFS volume containing file with DOS name with alphabetically larger hardlink in same directory"
+msg "file with DOS name with alphabetically larger hardlink in same directory"
 do_test "echo 1 > file; setfattr -v file -n system.ntfs_dos_name file; ln file zzz_link"
 
-msg "NTFS volume containing file with long name and with DOS name with alphabetically smaller hardlink in same directory"
+msg "file with long name and with DOS name with alphabetically smaller hardlink in same directory"
 do_test 'echo 1 > file_with_a_long_name;
 	 setfattr -v "file~1" -n system.ntfs_dos_name file_with_a_long_name;
 	 ln file_with_a_long_name aaa_link'
 
-msg "NTFS volume containing many nested directories"
+msg "many nested directories"
 do_test 'mkdir dir; mkdir dir/subdir; mkdir dir/subdir/subdir2; mkdir dir/subdir/subdir3'
 
-msg "NTFS volume containing identical files and symlinks in subdirectory"
+msg "identical files and symlinks in subdirectory"
 do_test 'mkdir dir;
 	 echo 888 > dir/file;
 	 echo 888 > dir/idfile2;
 	 ln -s ../dir dir/circle; ln -s file dir/filelink'
 
-msg "NTFS volume containing hard link group and identical files not hard linked"
+msg "hard link group and identical files not hard linked"
 do_test 'echo 888 > file;
 	 echo 888 > file2;
 	 ln file link;
 	 ln file link2;
 	 echo 888 > file3'
 
-msg "NTFS volume containing file with named data stream"
+msg "file with named data stream"
 do_test 'echo 1 > file;
 	 setfattr -n user.ads -v 2 file'
 
-msg "NTFS volume containing file with multiple named data streams"
+msg "file with multiple named data streams"
 do_test 'echo 1 > file;
 	 setfattr -n user.a -v 1 file;
 	 setfattr -n user.aa -v 11 file;
 	 setfattr -n user.aaa -v 111 file;
 	 setfattr -n user.aaaa -v 1111 file'
 
-msg "NTFS volume containing file with multiple named data streams with same contents"
+msg "file with multiple named data streams with same contents"
 do_test 'echo 1 > file;
 	 setfattr -n user.a -v 1111 file;
 	 setfattr -n user.aa -v 1111 file;
 	 setfattr -n user.aaa -v 1111 file;
 	 setfattr -n user.aaaa -v 1111 file;'
-	
-msg "NTFS volume containing file with named data streams with same contents as other file"
+
+msg "file with named data streams with same contents as other file"
 do_test 'echo -n > file;
 	 setfattr -n user.a -v 1111 file;
 	 echo -n 1111 > otherfile;'
 
-msg "NTFS volume containing file with empty named data stream and non-empty unnamed data stream"
+msg "file with empty named data stream and non-empty unnamed data stream"
 do_test 'echo 1 > file;
 	 setfattr -n user.ads -v "" file;'
 
-msg "NTFS volume containing file with empty named data stream and empty unnamed data stream"
+msg "file with empty named data stream and empty unnamed data stream"
 do_test 'echo -n > file;
 	 setfattr -n user.ads -v "" file;'
 
-msg "NTFS volume containing file with named data stream with hardlink"
+msg "file with named data stream with hardlink"
 do_test 'echo 999 > file;
 	 setfattr -n user.ads -v "888" file;
 	 ln file link;'
 
-msg "NTFS volume containing file with named data stream with hardlink and DOS name"
+msg "file with named data stream with hardlink and DOS name"
 do_test 'echo 999 > file;
 	 setfattr -n user.ads -v "888" file;
 	 ln file link;
 	 setfattr -v DOSNAME -n system.ntfs_dos_name file;'
 
-msg "NTFS volume containing C source code of wimlib"
+msg "C source code of wimlib"
 do_test 'cp $srcdir/src/*.{c,h} .'
 
-msg "NTFS volume containing file with security descriptor"
+msg "file with security descriptor"
 do_test 'touch file;
 	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` file'
 
-msg "NTFS volume containing files with different security descriptors"
+msg "files with different security descriptors"
 do_test 'touch file;
 	 touch file2;
 	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` file
 	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_2.base64` file'
-	
-msg "NTFS volume containing files with different security descriptors and some with the same security descriptor"
+
+msg "files with different security descriptors and some with the same security descriptor"
 do_test 'touch file;
 	 touch file2;
 	 touch file3;
@@ -234,7 +247,7 @@ do_test 'touch file;
 	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` dir
 	 setfattr -n system.ntfs_acl -v 0s`cat $srcdir/tests/security_descriptor_1.base64` file3'
 
-msg "NTFS volume containing tons of random stuff"
+msg "tons of random stuff"
 do_test 'echo -n 8 > file;
 	 ln file hardlink;
 	 ln -s hardlink symlink;