From patchwork Wed Apr 24 23:12:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10915879 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD9B7922 for ; Wed, 24 Apr 2019 23:13:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABE4728BD0 for ; Wed, 24 Apr 2019 23:13:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A06B628BE9; Wed, 24 Apr 2019 23:13:02 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 43A7128BD0 for ; Wed, 24 Apr 2019 23:13:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727474AbfDXXMq (ORCPT ); Wed, 24 Apr 2019 19:12:46 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:41724 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727463AbfDXXMq (ORCPT ); Wed, 24 Apr 2019 19:12:46 -0400 Received: by mail-pf1-f196.google.com with SMTP id 188so10100487pfd.8 for ; Wed, 24 Apr 2019 16:12:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=USyjebKhKCZCLrhUyqlX69vkoqbsFxWhHCmLAtiPTjk=; b=LrjzKFxVODV8Pr1dnRea7pyPGeBJmS9eBnfVmJ67fomco/hgGamwbbGddXrpUQ5OQ1 cdhpoLVzPGviAFCFtMaF3mNFXVCW5MWqQCcNTRs9OtEyYC710xTyziMDzWkwNiE6mZol KhVfqc9y7DRORxOLfn28xAAdbUTtcUbEkoax0= 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=USyjebKhKCZCLrhUyqlX69vkoqbsFxWhHCmLAtiPTjk=; b=m/XXYJ9Is/22UXKKPoKizQJWFNkYrG5yHpWPuoFms548BXZHv2ZV2B7eD6hLg5GoQS 2iL9heRUJteD1hGr49JvLmOxBggHhndcbXYrxjUzsJhchh5ydLvgnibeEkJtrScJ/kGW RdSXBreGWd4zcKGtmZpsZvV7Kxx46fs9iD4lOE5g+xvSs1hQe7c8HVh5D8NpYWK6GwI3 COCIayWrUP3ztwBim4RkZxL9gkyoQklmQI45oKrr7BDeucTbSsoPe2kSac2FQv5sG2Rs klILMy+Bmsatnp9NTFg9geGXziKJssw+K/coy22wAf9YE7KRVj2pq96RsqEcZQ4ZYgia uVOA== X-Gm-Message-State: APjAAAWU6QFZWAw0+7GEc1x1hfTPqx+j/cGF1Xm8kWQdRU6yYyqMlvcA U/9SmlxS5cGegUTF1fY1fDddXA== X-Google-Smtp-Source: APXvYqycbCdQbeLJP1q3+Fn6T26GnvkkzbCWr10Sjc48ytdPZn5nYqG/blhh4GIlO94nIyHI3nBTEw== X-Received: by 2002:a62:474a:: with SMTP id u71mr35333692pfa.87.1556147565647; Wed, 24 Apr 2019 16:12:45 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id a6sm39947726pgd.67.2019.04.24.16.12.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2019 16:12:44 -0700 (PDT) From: Kees Cook To: Shuah Khan Cc: Kees Cook , Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Darren Hart , Christian Brauner , Tycho Andersen , Serge Hallyn , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/8] selftests: Remove KSFT_TAP_LEVEL Date: Wed, 24 Apr 2019 16:12:36 -0700 Message-Id: <20190424231237.14776-8-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190424231237.14776-1-keescook@chromium.org> References: <20190424231237.14776-1-keescook@chromium.org> Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since sub-testing can now be detected by indentation level, this removes KSFT_TAP_LEVEL so that subtests report their TAP header for later parsing. Signed-off-by: Kees Cook --- tools/testing/selftests/Makefile | 6 ------ tools/testing/selftests/kselftest/runner.sh | 1 - 2 files changed, 7 deletions(-) diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 64699f59b95f..9f05448e5e4b 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -86,12 +86,6 @@ else endif endif -# KSFT_TAP_LEVEL is used from KSFT framework to prevent nested TAP header -# printing from tests. Applicable to run_tests case where run_tests adds -# TAP header prior running tests and when a test program invokes another -# with system() call. Export it here to cover override RUN_TESTS defines. -export KSFT_TAP_LEVEL=`echo 1` - # Prepare for headers install top_srcdir ?= ../../.. include $(top_srcdir)/scripts/subarch.include diff --git a/tools/testing/selftests/kselftest/runner.sh b/tools/testing/selftests/kselftest/runner.sh index b9f74e5a2ee5..eff3ee303d0d 100644 --- a/tools/testing/selftests/kselftest/runner.sh +++ b/tools/testing/selftests/kselftest/runner.sh @@ -2,7 +2,6 @@ # SPDX-License-Identifier: GPL-2.0 # # Runs a set of tests in a given subdirectory. -export KSFT_TAP_LEVEL=1 export skip_rc=4 export logfile=/dev/stdout export per_test_logging=