From patchwork Thu Jun 8 21:46:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9776599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F8B0603F5 for ; Thu, 8 Jun 2017 21:47:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FA8A285DA for ; Thu, 8 Jun 2017 21:47:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E65B285E7; Thu, 8 Jun 2017 21:47:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, WEIRD_QUOTING autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A70D285DB for ; Thu, 8 Jun 2017 21:47:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751870AbdFHVrz (ORCPT ); Thu, 8 Jun 2017 17:47:55 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:32952 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751728AbdFHVry (ORCPT ); Thu, 8 Jun 2017 17:47:54 -0400 Received: by mail-pf0-f196.google.com with SMTP id f27so6486745pfe.0 for ; Thu, 08 Jun 2017 14:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7uOycdX1srDhLUgEBUby8suv/ijUWtKKGhpmKid6XRM=; b=na4exgvZ5sUA2nAwBsr2Lr6yYqvHF7UHxf6OKAuuCuNEsOrP52Ql/aS0tnjAwS9EiP wUm6Mr+H8W4gvBSU8W70tz/4eaT+PGW/91GohnTiiq3oLyj+VCz5OZFxRgO0ANlqRzEc 8D2ebINiLyfGkhMxbheFnd6NwX7KtBM1fGueTr9bk/NNfHZxvgAGvvoMTtmwc6fu2J+C xOB7cdHnmnpRQuuSVZp2f53rO21qFl34XaTGQtK7e6a6n3AU1aYITPyfLGkqcQQ5DyHW I0AJEKLRDSEDgH1a4U7A5vZQUFdnm983quaBYi/A/Ti278YL+8+KWSl9Q3SfMallfqxB UAAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7uOycdX1srDhLUgEBUby8suv/ijUWtKKGhpmKid6XRM=; b=AQxTv+dLIaNYaReiYDCPO4LeaQpfgAeIl175P9+T1icdukBnK4uXfFrfuq56lpXryg r+1Ss6GAYcRMK3lFNRKdSL8mFHVs2Wnri9vFSRJ5QBjyjeosKNFOp/ofKUpTYmSZQLWc BCeNdx1GjV9dU4HvQZz2MaF2MV28IdvuI6qUbWpwwTbrAbA4JHx1T5D2TaPdsN15A/+Z LyfZPcsd/iW2Mikh1yy7H41Yi6tbyTwURQ2wBIjy0WHgitvKTP6lpsXyupcoyXIBwYFF kneHG+PtzMy3I6ldrZK+7HzEg539ZPNLpkFuCnsv3PErOwh47b4xkXpxVsNFtx/7NVY0 nCxQ== X-Gm-Message-State: AODbwcBsN/N1FWCJf/xVLO4UlGt2Xr+LLXB/OpmZA62A+Q3eI2w7/d/+ c8lRACUmzZbJYg== X-Received: by 10.98.0.69 with SMTP id 66mr409434pfa.127.1496958468683; Thu, 08 Jun 2017 14:47:48 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.174.81]) by smtp.gmail.com with ESMTPSA id a12sm421868pgd.38.2017.06.08.14.47.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Jun 2017 14:47:48 -0700 (PDT) From: Eric Biggers To: Theodore Ts'o Cc: fstests@vger.kernel.org, Eric Biggers Subject: [PATCH 2/2] xfstests-bld: misc: remove encrypt-smoketest Date: Thu, 8 Jun 2017 14:46:27 -0700 Message-Id: <20170608214627.136906-2-ebiggers3@gmail.com> X-Mailer: git-send-email 2.13.0.506.g27d5fe0cd-goog In-Reply-To: <20170608214627.136906-1-ebiggers3@gmail.com> References: <20170608214627.136906-1-ebiggers3@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers 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 --- 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