tests: adjust calling of wimlib-imagex

[wimlib] / tests / test-imagex-ntfs

diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs
index 783c96acee22f1265d650633e827d2b0f091e1fb..1f3d1c57c88fb5aefd974fa2aa6ce77c099295df 100755 (executable)
--- a/tests/test-imagex-ntfs
+++ b/tests/test-imagex-ntfs
@@ -43,12 +43,12 @@ __do_mount() {
        if ! ntfs-3g -o "no_def_opts,silent" $1 $2; then
                if [ $UID -ne 0 ] && [ "$3" = "nofail" ]; then
                        echo "WARNING: skipping NTFS tests because we aren't able to "
-                       echo "mount a NTFS volume (perhaps ntfs-3g is not installed setuid root?)"
+                       echo "mount an NTFS volume (perhaps ntfs-3g is not installed setuid root?)"
                        skip_test
                else
                        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."
+                             "installed setuid root, so that we can mount an NTFS volume."
                fi
        fi
 }
@@ -85,10 +85,10 @@ do_test() {
        eval "$1"
        cd ..
        __do_unmount in.mnt
-       if ! imagex capture in.ntfs ntfs.wim; then
+       if ! wimcapture in.ntfs ntfs.wim; then
                error "Failed to capture NTFS volume into a WIM"
        fi
-       if ! imagex apply ntfs.wim 1 out.ntfs; then
+       if ! wimapply ntfs.wim 1 out.ntfs; then
                error "Failed to apply WIM to NTFS volume"
        fi
        __do_mount in.ntfs in.mnt noatime
@@ -101,7 +101,7 @@ do_test() {
                        echo "Dumping tree of applied image"
                        tree out.mnt --inodes -F -s --noreport
                        error 'Information was lost or corrupted while capturing
-                               and then applying a NTFS volume'
+                               and then applying an NTFS volume'
                fi
        fi
        rm -rf out.mnt/* in.mnt/*
@@ -272,7 +272,7 @@ do_test 'echo -n 8 > file;
         setfattr -n user.ads3 anotherfile -v 33;
         echo -n > emptyfile;
         setfattr -n user.ads emptyfile -v 8;
-        setfattr -n user.ads5 emptyfile -v"`cat $srcdir/src/hardlink.c`"
+        setfattr -n user.ads5 emptyfile -v"`cat $srcdir/src/sha1.c`"
         mkdir dir/subdir;
         ln file dir/subdir/file;
         echo -n 8 > dir/subdir/file2;