[PATCH 1/2] xfstests-bld: misc: remove encrypt-test-revalidate

[PATCH 1/2] xfstests-bld: misc: remove encrypt-test-revalidate

[Eric Biggers]

From: Eric Biggers <ebiggers@google.com>

The encrypt-test-revalidate script isn't useful anymore because what it
did is now covered by xfstest generic/429.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 misc/Makefile.in             |  3 +--
 misc/encrypt-test-revalidate | 47 --------------------------------------------
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100755 misc/encrypt-test-revalidate

diff --git a/misc/Makefile.in b/misc/Makefile.in
index a71bd6d..c0f2395 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -13,8 +13,7 @@ LDFLAGS = @LDFLAGS@
 
 PROGS= fname_benchmark postmark resize syncfs
 SCRIPTS= encrypt-fname-benchmark \
-	encrypt-smoketest \
-	encrypt-test-revalidate
+	encrypt-smoketest
 
 all: $(PROGS)
 
diff --git a/misc/encrypt-test-revalidate b/misc/encrypt-test-revalidate
deleted file mode 100755
index 2a4e763..0000000
--- a/misc/encrypt-test-revalidate
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh -vx
-. /root/test-config
-
-dmesg -n 7
-mkdir -p /vdc
-
-do_mount ()
-{
-    mount -t ext4 $VDC /vdc
-}
-
-do_unmount ()
-{
-    umount /vdc
-}
-
-mke2fs -t ext4 -O encrypt,^metadata_csum -Fq $VDC
-do_mount
-mkdir /vdc/a /vdc/b
-echo foobar | e4crypt add_key /vdc/a
-cp /etc/motd /vdc/a
-ln -s motd /vdc/a/link
-cp -r /root/xfstests /vdc/a
-do_unmount
-do_mount
-ls -l /vdc/a
-cat /vdc/a/link
-cat /vdc/a/motd
-keys=$(keyctl show | grep ext4 | awk '{print $1}')
-echo $keys | xargs -n 1 keyctl invalidate
-f=$(find /vdc/a -maxdepth 1 -type f)
-ls -l /vdc/a/NOEXIST
-ls -l /vdc/a/xfstests/README
-ls -l /vdc/a
-ls -l $f
-echo foobar | e4crypt add_key
-ls -l /vdc/a/NOEXIST
-ls -l /vdc/a/xfstests/README
-ls -l $f
-ls -l /vdc/a
-keys=$(keyctl show | grep ext4 | awk '{print $1}')
-echo $keys | xargs -n 1 keyctl invalidate
-ls -l /vdc/a/NOEXIST
-ls -l /vdc/a/xfstests/README
-ls -l $f
-ls -l /vdc/a
-do_unmount
-- 
2.13.0.506.g27d5fe0cd-goog

[PATCH 2/2] xfstests-bld: misc: remove encrypt-smoketest

[Eric Biggers]

From: Eric Biggers <ebiggers@google.com>

The encrypt-smoketest script isn't really useful anymore now that
xfstests has an "encrypt" group of tests, which can be run in all
configurations using a command like 'kvm-xfstests -g encrypt'.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 misc/Makefile.in       |  3 +--
 misc/encrypt-smoketest | 68 --------------------------------------------------
 2 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100755 misc/encrypt-smoketest

diff --git a/misc/Makefile.in b/misc/Makefile.in
index c0f2395..ec10377 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -12,8 +12,7 @@ CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
 PROGS= fname_benchmark postmark resize syncfs
-SCRIPTS= encrypt-fname-benchmark \
-	encrypt-smoketest
+SCRIPTS= encrypt-fname-benchmark
 
 all: $(PROGS)
 
diff --git a/misc/encrypt-smoketest b/misc/encrypt-smoketest
deleted file mode 100755
index e207937..0000000
--- a/misc/encrypt-smoketest
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh -vx
-
-. /root/test-config
-
-dmesg -n 7
-mkdir -p /vdc
-
-setup_test_dummy_key ()
-{
-    mode='\x00\x00\x00\x00'
-    raw="$(printf ""\\\\x%02x"" $(seq 0 63))"
-    if lscpu | grep "Byte Order" | grep -q Little ; then
-	size='\x40\x00\x00\x00'
-    else
-	size='\x00\x00\x00\x40'
-    fi
-    key="${mode}${raw}${size}"
-    keyctl new_session
-    echo -n -e "${key}" | keyctl padd logon fscrypt:4242424242424242 @s
-}
-
-do_mount ()
-{
-    mount -t ext4 $VDC /vdc
-}
-
-do_unmount ()
-{
-    umount /vdc
-}
-
-do_smoketest ()
-{
-    do_mount
-    rm -rf /vdc/a /vdc/b
-    mkdir /vdc/a /vdc/b
-    echo foobar | e4crypt add_key /vdc/a
-    cp /etc/motd /vdc
-    mv /vdc/motd /vdc/a
-    cp /etc/motd /vdc/a
-    ln -s motd /vdc/a/link
-    cp -r /root/xfstests /vdc/a
-    do_unmount
-    do_mount
-    lsattr /vdc/a
-    ls -l /vdc/a
-    cat /vdc/a/link
-    cat /vdc/a/motd
-    do_unmount
-    keyctl purge logon
-    do_mount
-    lsattr /vdc/a
-    ls -l /vdc/a
-    if test -z "$SKIP_CLEANUP" ; then
-	rm -rf /vdc/a /vdc/b
-    fi
-    do_unmount
-}
-
-if test -z "$SKIP_NO_DIR_INDEX" ; then
-    mke2fs -t ext4 -O encrypt,^dir_index -Fq $VDC
-    do_smoketest
-fi
-
-if test -z "$SKIP_DIR_INDEX" ; then
-    mke2fs -t ext4 -O encrypt -Fq $VDC
-    do_smoketest
-fi
-- 
2.13.0.506.g27d5fe0cd-goog

Re: [PATCH 1/2] xfstests-bld: misc: remove encrypt-test-revalidate

[Theodore Ts'o]

On Thu, Jun 08, 2017 at 02:46:26PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> The encrypt-test-revalidate script isn't useful anymore because what it
> did is now covered by xfstest generic/429.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Thanks, applied.

						- Ted

Re: [PATCH 2/2] xfstests-bld: misc: remove encrypt-smoketest

[Theodore Ts'o]

On Thu, Jun 08, 2017 at 02:46:27PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> The encrypt-smoketest script isn't really useful anymore now that
> xfstests has an "encrypt" group of tests, which can be run in all
> configurations using a command like 'kvm-xfstests -g encrypt'.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Thanks, applied.

					- Ted