From patchwork Sat May 25 11:49:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 165177 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp4744856ili; Sat, 25 May 2019 04:49:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqxjGt9s9R5N7FjDw9cgYViKBx1S9hIm4c45fgkl+bJ8nb76YN66JqxQvry4P2KBzDm4J+pi X-Received: by 2002:a17:902:2847:: with SMTP id e65mr110019769plb.319.1558784986070; Sat, 25 May 2019 04:49:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558784986; cv=none; d=google.com; s=arc-20160816; b=RVs2j9DuGbqu4uk7/T9PEKOukmweHyt5ihNcCuV+g+dTjfdw4h2tLlwj8/cwe3q6Qq xXvUSCjal69b4sTMaKWoXLUoMSxVL5MyuyFdwOhVE4RRrPGeSZTrlcYf7/eBvTcHEwlZ aXKN0NcwLFPerLf8AUZBRqF6ZQ6rd0xDYBqec+e+r395Jc2DxtLGLfSJRZh1w5qU78xm fdkqrletHNvUfFqm+2Rc9gRHQDbnzj6xMZWIoiJzSfigptQgKQ+R2t0SPJAuThtZ9oJd qINfbdkIAHqeXAyjN109xlev4REmuIrfss8yaFHzziSS0KGAFQNYHhdXqFlVr9vm6JaL AibQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=GcQ0/FUcETTNQeH6qzQKxM8A8Qu2qmHKXiYNQ7p/tn0=; b=GnlDRxMBGdK+RYHk2bBUOubZCEHqLtHxTfZXU3Zw2d1ko/kg0BjDHCB5ZN0o1fvv2I M2VVJGF0ZECKeQOqst/bJhkWTVPGMLwQzCv/XG5SlkjOhYsMqPK2qotbL2+OAaKuOxAp qsrrnz8vJ8tqtBkPsx+IYuY/Dcokmgg0PQ6kMbPly/bAWG9jOpwIRgh9k/CJinioYLHh ky3Rs/+Z7dnOwNiv5yX3EeuamaoA3dZ7bZrjPfb/SLJ6SuinJ1LypNiiKlviW78nIx7J xPV2l7droN6/YeTFfkciyGyKEs7KHnYtKfFUi7bUEX4kSh82TDL9ac90NR6jERrXgqHN xtbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=CdYjXNoh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g67si7240097pgc.344.2019.05.25.04.49.45; Sat, 25 May 2019 04:49:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=CdYjXNoh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726857AbfEYLtk (ORCPT + 30 others); Sat, 25 May 2019 07:49:40 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:19685 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726697AbfEYLtk (ORCPT ); Sat, 25 May 2019 07:49:40 -0400 Received: from grover.flets-west.jp (softbank126125154139.bbtec.net [126.125.154.139]) (authenticated) by conuserg-11.nifty.com with ESMTP id x4PBnLmr006832; Sat, 25 May 2019 20:49:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x4PBnLmr006832 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1558784962; bh=GcQ0/FUcETTNQeH6qzQKxM8A8Qu2qmHKXiYNQ7p/tn0=; h=From:To:Cc:Subject:Date:From; b=CdYjXNohyx7syAc6Z486jL4ktqGmdHFwPBG20R/Sk6klfweBdmLxmZOwLjGGiW56y /3Q7Hiz3cdDUnBlyGx+kOeW1e3jtr8fTfsD9YamQNastvfc0efpTvmxWsfIs/Z/fzT uwF8NRs0sCOUnceAYciwtwLAG3kPu/ciwqHRS6AfuDxg8j9/cifs9EkO7EJm2b/vx8 DwyUf8XNjhMp8CQj9rkmio7asncHBE3f4wg+ZflbXiFgDUm8AtpubgqAC0RaCyAh8j 0jMB8m4iqLHfKTnCj0rXdBh0D3PyJTrjs6W5iw0UFb6lrzvM31lOk0Ru5SciX0AIzR 6u6F1ILeUp/vw== X-Nifty-SrcIP: [126.125.154.139] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] kconfig: tests: fix recursive inclusion unit test Date: Sat, 25 May 2019 20:49:19 +0900 Message-Id: <20190525114919.26188-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding SPDX license identifier is pretty safe; however, here is one exception. Since commit ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig"), "make testconfig" would not pass. When Kconfig detects a circular file inclusion, it displays error messages with a file name and a line number prefixed to each line. The unit test checks if Kconfig emits the error messages correctly (this also checks the line number correctness). Now that the test input has the SPDX license identifier at the very top, the line numbers in the expected stderr should be incremented by 1. Fixes: ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig") Signed-off-by: Masahiro Yamada --- scripts/kconfig/tests/err_recursive_inc/expected_stderr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/scripts/kconfig/tests/err_recursive_inc/expected_stderr b/scripts/kconfig/tests/err_recursive_inc/expected_stderr index 6b582eee2176..b070a31fdfeb 100644 --- a/scripts/kconfig/tests/err_recursive_inc/expected_stderr +++ b/scripts/kconfig/tests/err_recursive_inc/expected_stderr @@ -1,6 +1,6 @@ Recursive inclusion detected. Inclusion path: current file : Kconfig.inc1 - included from: Kconfig.inc3:1 - included from: Kconfig.inc2:3 - included from: Kconfig.inc1:4 + included from: Kconfig.inc3:2 + included from: Kconfig.inc2:4 + included from: Kconfig.inc1:5