From patchwork Thu Apr 5 21:20:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10325477 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 E41A8600CB for ; Thu, 5 Apr 2018 21:22:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D52B7293DA for ; Thu, 5 Apr 2018 21:22:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C99C1293E9; Thu, 5 Apr 2018 21:22:06 +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, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 71FA0293DA for ; Thu, 5 Apr 2018 21:22:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752281AbeDEVWF (ORCPT ); Thu, 5 Apr 2018 17:22:05 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:37079 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751874AbeDEVWE (ORCPT ); Thu, 5 Apr 2018 17:22:04 -0400 Received: by mail-pl0-f67.google.com with SMTP id v5-v6so19086702plo.4 for ; Thu, 05 Apr 2018 14:22:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=bn1QZGbH7EWYp8PiIHryptua81Z3W8DKA4TQF7YE4Hk=; b=qdA2PpzyOIYa3z/Mv16Qzi1yCif6cb0bHU5fG+WaYjbNpptjcJRVMhx8nyDDDkq5tu VOa7QQtcR2h9j0Z8pABp1aPlNgoFv5a3FKTb73Dgucw8HxK2lhX6vtDOGglMRGhLe0P0 Fl3DtfFnHDvr6AIyLk2x9d1w+G55jZ3XcMTfEnT//xKIQ/nDqh4ozHS2KjiaLxFvC9gk MhJbADBftiwAMP1wu+QbADwfDhDl5lTQCWXvHmB7GOKqxpt70ltDWULhk8qyFdjy80i6 qtjArrVdnyMwdC47EgMEA1/FIyiLqYyOLs8gimSrd5kV8a8yjK5+H+WYzQltQSyDdql5 iOHA== 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; bh=bn1QZGbH7EWYp8PiIHryptua81Z3W8DKA4TQF7YE4Hk=; b=HSFNXKkvKgXUMUB1vZP/rQdmrwkJ+NJwRnLVWBMCeZVnXN+zTIo5Apx2JqyD3cyLcY ANVzaEN6OkIFvEiuPSUH11gkAuoyFOvMLja3rkiwtEQX3tROpAbN+zbtX/WCcxhDEN5O mnjVhyzbEioZbzrh6VNVtgrh7BX/pfFT5jQFQ2E3kD5nZQDV2ASfjzY6VVl3sH5va7KE GgrQI55QdtAhUL5H/2zpeBpV2Adf6ZRz2K/MnChKFmDSZUq6TdlT7Kk/l892nS+6jrKy YrIsnXq427wed8Ys7rphfuE0WVfuv62z3QwPgACVF8456kkzglnFvttNOG9taFl3/5R4 7+Gw== X-Gm-Message-State: AElRT7GaxrU3fNv6Fjr5i9aXYQ0ztmWaisP2tyHgiQArMpzwxQ8unDfq ciYikVKTodPbcsRl5bUbZxypUw== X-Google-Smtp-Source: AIpwx48H7wUS9g2S1W6lxBa/kYOBDMAx79q3A0sS3r0pMEiMsAXHornbm4VWsSNJkRUxWru3mkETLQ== X-Received: by 2002:a17:902:85:: with SMTP id a5-v6mr24068332pla.99.1522963323675; Thu, 05 Apr 2018 14:22:03 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([2620:15c:17:3:dc28:5c82:b905:e8a8]) by smtp.gmail.com with ESMTPSA id t137sm15591620pgc.16.2018.04.05.14.22.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Apr 2018 14:22:02 -0700 (PDT) From: Eric Biggers To: Theodore Ts'o Cc: fstests@vger.kernel.org, Eric Biggers Subject: [xfstests-bld PATCH] util/get-config: stop sourcing deprecated config files Date: Thu, 5 Apr 2018 14:20:10 -0700 Message-Id: <20180405212010.132258-1-ebiggers@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Stop sourcing configs from the deprecated locations $KVM_CONFIG or kvm-xfstests/config.custom, in preference to the locations in ~/.config/. kvm-xfstests and gce-xfstests have been warning when sourcing from the deprecated locations for almost a year now, so it's unlikely that anyone is using them anymore. Signed-off-by: Eric Biggers --- kvm-xfstests/util/get-config | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/kvm-xfstests/util/get-config b/kvm-xfstests/util/get-config index 4baf494..894bf3b 100644 --- a/kvm-xfstests/util/get-config +++ b/kvm-xfstests/util/get-config @@ -48,21 +48,6 @@ then rm "$tmpfile" unset tmpfile fi - if test -n "$GCE_ACCOUNT" -a -f "$DIR/config-$GCE_ACCOUNT" ; then . "$DIR/config-$GCE_ACCOUNT" -elif test -f $DIR/config.custom ; then -# Else, source kvm-xfstests/config.custom if present (deprecated) - echo -e 1>&2 "Warning: use of kvm-xfstests/config.custom is deprecated." \ - "Move your settings\n into ~/.config/kvm-xfstests," \ - "~/.config/gce-xfstests,\n ~/.config/android-xfstests," \ - "and/or ~/.config/xfstests-common" - . $DIR/config.custom -fi - -# Source $KVM_CONFIG if present (deprecated) -if test -n "$KVM_CONFIG" -a -f "$KVM_CONFIG"; then - echo -e 1>&2 "Warning: use of \$KVM_CONFIG is deprecated." \ - "Move your settings into\n ~/.config/kvm-xfstests" - . $KVM_CONFIG fi