From patchwork Fri Mar 2 04:31:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130456 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp857726lja; Thu, 1 Mar 2018 20:35:01 -0800 (PST) X-Google-Smtp-Source: AG47ELsotiYei8iYWCv4L4X3atA7tPjgywElgRKi5I6Lle3wHY/TsjVlTRU2UJ62XGrLe+HzmUGd X-Received: by 2002:a17:902:7d17:: with SMTP id z23-v6mr4041496pll.427.1519965301261; Thu, 01 Mar 2018 20:35:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965301; cv=none; d=google.com; s=arc-20160816; b=k1/jt86f0OH1GiODEejq3NIrrcGVgjwL4PV4kg8lhSyCCKFvyjIArqBUqMjtJr/ex5 Bzpxvs+3oog8Q+c0bDE/hmp93HwM6xg/wvU5gokmnikAZjYx2zxnnYkQ1JtnAVknF4em neYiBOizWkhurh0MogJVFJujnEIcC7y+oM8XvDbA8EcAKRnd/MDKph+E/RJ2s0z+Gt1Y bx6iJYMWkspKgemMz90TJ/ztSnGMyepMDpWoMRoUMVc0x+AfozBfvrH2ClaycXztnGQS DC8ADiqPJL+uI6coPHluWmQRpLYzVMLurwhwGnAoC4Y8M/fqvtTvBQ7lPo3DQFK2bfRM 3ofw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=n3TiXYeIZq5TxMCCO5/91SkL7VVJ0kFWr2vwwZHYS3A=; b=pms+KqVzkFcOcmqdrkLQrvqA4cUeAW9NpGLW5TII7WbD33UganuLh9lXFo4t0hF0fE 8ByNO0UuUbtkvRFwvuVzA2/APMgX1ZKaTPlZUx6UVWh7ACXOuZsRHrwOp/adS4dDpjc2 6zaRjNpJdaUB7i1hxc7lEFbDvG5kCHqls633/O7P2nzYB/18DRstwMZWrsybN+G8I6st OF4vMEYkJyQr0SCFvdHgeObdErcsUlQF+JKk8bY3KWiXEfUWaxU6sTi1S1NmRWwJ0ph4 LNDc/12ZTkqPl+IIo7QDMc+2a9DLtZis9mrWgJx8bOq2+/sR9EWNQ2CyNA5samNU1btL /CKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=qb3eBU0O; 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 h89si4224220pfa.182.2018.03.01.20.35.01; Thu, 01 Mar 2018 20:35:01 -0800 (PST) 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=qb3eBU0O; 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 S1165079AbeCBEe5 (ORCPT + 28 others); Thu, 1 Mar 2018 23:34:57 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53203 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164993AbeCBEds (ORCPT ); Thu, 1 Mar 2018 23:33:48 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURC022085; Fri, 2 Mar 2018 13:32:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURC022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965152; bh=n3TiXYeIZq5TxMCCO5/91SkL7VVJ0kFWr2vwwZHYS3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qb3eBU0Op06riLVBpYsUR0BBXrGyJ4nYqxY+FagMWk8Pjp/Wnk17OYhjpqmV6ToMd vfyy0XO4pUPhb8vGR6fuhnnUD3M3JTWyTxP1yIkYqFcDxQgCAX9e+MzXxXm13j4mu0 9SAQJC0IPwaMjDc4C71uEYfWD+7AdeIfd4aEeBXbhRvJuKyOcp43dS3T8RzlYhx4LR fo9nyM/iz9akLzREEEd9vZq9jp26/79wTNBNcHMuix9mKlAKCbO/LQi1Dv1INZ2jnl Y7LI4w6Mbb6ZJ20oDfl4cwTyNiJWa2Md5xFpDOraCh6SJ0KRVOY4E8XE1x4dN9dJ2d Yy5AzJdHpN4CA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , Tony Luck , linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, Fenghua Yu Subject: [PATCH v2 01/11] kbuild: define PYTHON2 and PYTHON3 variables instead of PYTHON Date: Fri, 2 Mar 2018 13:31:51 +0900 Message-Id: <1519965121-12017-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The variable 'PYTHON' allows users to specify a proper executable name in case the default 'python' does not work. However, this does not address the case where both Python 2 and Python 3 scripts are used in one source tree. PEP 394 (https://www.python.org/dev/peps/pep-0394/) provides a convention for Python scripts portability. Here is a quotation: In order to tolerate differences across platforms, all new code that needs to invoke the Python interpreter should not specify 'python', but rather should specify either 'python2' or 'python3'. This distinction should be made in shebangs, when invoking from a shell script, when invoking via the system() call, or when invoking in any other context. arch/ia64/scripts/unwcheck.py is apparently written in Python 2, so it should be invoked by 'python2'. It is legitimate to use 'python' for scripts compatible with both Python 2 and Python 3, but this is rare (at least I do not see the case in kernel tree). You do not need to make efforts to write your scripts in that way. Anyway, Python 2 will retire in 2020. This commit is needed for new scripts written in Python 3. For the backward compatibility for ia64, if 'PYTHON' is specified, it is propagated to 'PYTHON2'. Signed-off-by: Masahiro Yamada --- Changes in v2: - Add backward compatibility for PYTHON Makefile | 5 +++-- arch/ia64/Makefile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index 4fb97e9..ea23d9b 100644 --- a/Makefile +++ b/Makefile @@ -393,7 +393,8 @@ GENKSYMS = scripts/genksyms/genksyms INSTALLKERNEL := installkernel DEPMOD = /sbin/depmod PERL = perl -PYTHON = python +PYTHON2 := $(if $(PYTHON), $(PYTHON), python2) +PYTHON3 := python3 CHECK = sparse CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ @@ -439,7 +440,7 @@ GCC_PLUGINS_CFLAGS := export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES -export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE +export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON2 PYTHON3 UTS_MACHINE export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 2dd7f51..862a2ba 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile @@ -75,7 +75,7 @@ vmlinux.gz: vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ unwcheck: vmlinux - -$(Q)READELF=$(READELF) $(PYTHON) $(srctree)/arch/ia64/scripts/unwcheck.py $< + -$(Q)READELF=$(READELF) $(PYTHON2) $(srctree)/arch/ia64/scripts/unwcheck.py $< archclean: $(Q)$(MAKE) $(clean)=$(boot) From patchwork Fri Mar 2 04:31:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130458 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp858219lja; Thu, 1 Mar 2018 20:35:49 -0800 (PST) X-Google-Smtp-Source: AG47ELsZkLLy7FSSjlcH9h/Iqc8XWH8+VQosWrGdaIsYHyaob0oezDmG6YN80s85+0sf+2AEpCHY X-Received: by 10.98.217.76 with SMTP id s73mr4333994pfg.209.1519965349795; Thu, 01 Mar 2018 20:35:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965349; cv=none; d=google.com; s=arc-20160816; b=lpeTW4LM77BJNfzO4I5qwKpoovGZfa10FfNCwjqJn3VMkW/UJSoYvC5/q3YYY6rsbc Ych0CvoS9rYPmhfLapR/tNV4Jp/VjxGWLyr/zUMP5zfrlj7XejTvsd1Tr2K9VzbyqaGL lb1nVHsgXkbqlf2Pj3HF5AbdtXlR7ze+eiMb2Bjyh3l0AIxb4Lfy69N9mt2wK/Nzn88t orrVxNnnltb+otkHISdsIvZoHJ417cnCr1xR4uMEZmxAkIdatqd7Ofmyv5P+VCj2R3o0 CQcdVsxT6meahOp1Z5Tisy6IK11RCYwGvi9WYbxbQTyid0y/4lUtXE7FTuYE49/LNKOm cELA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=x6kTX6cDq98NnpSAo52RNuWNblmDLjrpV/2Bkj7+O+c=; b=M0f/0kCQOw+oEBnRbytt2KkNzPb65ADGUJzOex0FjXLz4+uU7BQTYE/94tqrlAkD3O 8TzkxhY4BXlSRbSEMDbNKJmg5YkjeYCuFxpFS8oAEjmjLnBg897ozfNyML0AYrUTO1Ym 0l/eNyHyDj2eW7BGyfKzyvNzZpIOoC+q7fpQJBSRLEfDXLmicCNUQPbA58ndBf7+crJ2 NX47R2NDc0x4Y2pNbUNTqhq11BBJYSPoGd2MzRFRhuL+Q8qwxrFMgl1ubSBqcifobhjN a1mmiuSz5jU8WU8NWTBygJMyGWVPnnzjeznX0M4GAeJcurFc+wEvLPntHdrRQr/XQhRl dyZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=s6Zhxsn6; 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 w16-v6si4077946plp.87.2018.03.01.20.35.49; Thu, 01 Mar 2018 20:35:49 -0800 (PST) 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=s6Zhxsn6; 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 S1422727AbeCBEfd (ORCPT + 28 others); Thu, 1 Mar 2018 23:35:33 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53192 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164992AbeCBEdr (ORCPT ); Thu, 1 Mar 2018 23:33:47 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURD022085; Fri, 2 Mar 2018 13:32:32 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURD022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965153; bh=x6kTX6cDq98NnpSAo52RNuWNblmDLjrpV/2Bkj7+O+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s6Zhxsn6DmfMxxVrFTwzHFo0aMxqmewb5cCbhCAPqVqdudc/oNnhqy4Lal71SqigQ bCumKfO2Rqu7o2B6QMDFyldpucyxvqkmru/bZNNPgBhXOJb4cOBjleG3AJwjOg5M0E rCeIuoQCj9WkrhQyR9aZn0T7sHwf8Cdsjv16D2stAKJF44kIxnvTo+qyca7CFp+wUW lXXWY6OKssjiz6nXBUvp9ApeRcy7F/GfL0VK0YfsBjxtmlgYjZ/Kp0GjVdT661k1vS cQyEOgPULLxYpgdVMUXDsNEteVMTFX4xPJMXuopTsGYEdVvmYPT6ifjXK9NdpMqv0w EgQu5ENdLhaTg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 02/11] kconfig: unittest: add framework for Kconfig unit testing Date: Fri, 2 Mar 2018 13:31:52 +0900 Message-Id: <1519965121-12017-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Many parts in Kconfig are so cryptic and need refactoring. However, its complexity prevents us from moving forward. There are several naive corner cases where it is difficult to notice breakage. If those are covered by unit tests, we will be able to touch the code with more confidence. Here is a simple test framework based on pytest. The conftest.py provides a fixture useful to run commands such as 'oldaskconfig' etc. and to compare the resulted .config, stdout, stderr with expectations. How to add test cases? ---------------------- For each test case, you should create a subdirectory under scripts/kconfig/tests/ (so test cases are separated from each other). Every test case directory should contain the following files: - __init__.py: describes test functions - Kconfig: the top level Kconfig file for the test To do a useful job, test cases generally need additional data like input .config and information about expected results. How to run tests? ----------------- You need Python3 and pytest. Then, run "make testconfig". O= option is supported. If V=1 is given, detailed logs captured during tests are displayed. Signed-off-by: Masahiro Yamada Reviewed-by: Ulf Magnusson --- Changes in v2: - Add 'randconfig' support - Add docstring - Fix various style errors detected by 'pep8' and 'pep257' scripts/kconfig/Makefile | 8 ++ scripts/kconfig/tests/conftest.py | 291 ++++++++++++++++++++++++++++++++++++++ scripts/kconfig/tests/pytest.ini | 6 + 3 files changed, 305 insertions(+) create mode 100644 scripts/kconfig/tests/conftest.py create mode 100644 scripts/kconfig/tests/pytest.ini -- 2.7.4 diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 753a6de4..085aab1 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -142,6 +142,14 @@ PHONY += tinyconfig tinyconfig: $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config +# CHECK: -o cache_dir= working? +PHONY += testconfig +testconfig: $(obj)/conf + $(PYTHON3) -B -m pytest $(srctree)/$(src)/tests \ + -o cache_dir=$(abspath $(obj)/tests/.cache) \ + $(if $(findstring 1,$(KBUILD_VERBOSE)),--capture=no) +clean-dirs += tests/.cache + # Help text used by make help help: @echo ' config - Update current config utilising a line-oriented program' diff --git a/scripts/kconfig/tests/conftest.py b/scripts/kconfig/tests/conftest.py new file mode 100644 index 0000000..0345ef6 --- /dev/null +++ b/scripts/kconfig/tests/conftest.py @@ -0,0 +1,291 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2018 Masahiro Yamada +# + +""" +Kconfig unit testing framework. + +This provides fixture functions commonly used from test files. +""" + +import os +import pytest +import shutil +import subprocess +import tempfile + +CONF_PATH = os.path.abspath(os.path.join('scripts', 'kconfig', 'conf')) + + +class Conf: + """Kconfig runner and result checker. + + This class provides methods to run text-based interface of Kconfig + (scripts/kconfig/conf) and retrieve the resulted configuration, + stdout, and stderr. It also provides methods to compare those + results with expectations. + """ + + def __init__(self, request): + """Create a new Conf instance. + + request: object to introspect the requesting test module + """ + # the directory of the test being run + self._test_dir = os.path.dirname(str(request.fspath)) + + # runners + def _run_conf(self, mode, dot_config=None, out_file='.config', + interactive=False, in_keys=None, extra_env={}): + """Run text-based Kconfig executable and save the result. + + mode: input mode option (--oldaskconfig, --defconfig= etc.) + dot_config: .config file to use for configuration base + out_file: file name to contain the output config data + interactive: flag to specify the interactive mode + in_keys: key inputs for interactive modes + extra_env: additional environments + returncode: exit status of the Kconfig executable + """ + command = [CONF_PATH, mode, 'Kconfig'] + + # Override 'srctree' environment to make the test as the top directory + extra_env['srctree'] = self._test_dir + + # Run Kconfig in a temporary directory. + # This directory is automatically removed when done. + with tempfile.TemporaryDirectory() as temp_dir: + + # if .config is given, copy it to the working directory + if dot_config: + shutil.copyfile(os.path.join(self._test_dir, dot_config), + os.path.join(temp_dir, '.config')) + + ps = subprocess.Popen(command, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + cwd=temp_dir, + env=dict(os.environ, **extra_env)) + + # If input key sequence is given, feed it to stdin. + if in_keys: + ps.stdin.write(in_keys.encode('utf-8')) + + while ps.poll() is None: + # For interactive modes such as oldaskconfig, oldconfig, + # send 'Enter' key until the program finishes. + if interactive: + ps.stdin.write(b'\n') + + self.retcode = ps.returncode + self.stdout = ps.stdout.read().decode() + self.stderr = ps.stderr.read().decode() + + # Retrieve the resulted config data only when .config is supposed + # to exist. If the command fails, the .config does not exist. + # 'listnewconfig' does not produce .config in the first place. + if self.retcode == 0 and out_file: + with open(os.path.join(temp_dir, out_file)) as f: + self.config = f.read() + else: + self.config = None + + # Logging: + # Pytest captures the following information by default. In failure + # of tests, the captured log will be displayed. This will be useful to + # figure out what has happened. + + print("[command]\n{}\n".format(' '.join(command))) + + print("[retcode]\n{}\n".format(self.retcode)) + + print("[stdout]") + print(self.stdout) + + print("[stderr]") + print(self.stderr) + + if self.config is not None: + print("[output for '{}']".format(out_file)) + print(self.config) + + return self.retcode + + def oldaskconfig(self, dot_config=None, in_keys=None): + """Run oldaskconfig. + + dot_config: .config file to use for configuration base (optional) + in_key: key inputs (optional) + returncode: exit status of the Kconfig executable + """ + return self._run_conf('--oldaskconfig', dot_config=dot_config, + interactive=True, in_keys=in_keys) + + def oldconfig(self, dot_config=None, in_keys=None): + """Run oldconfig. + + dot_config: .config file to use for configuration base (optional) + in_key: key inputs (optional) + returncode: exit status of the Kconfig executable + """ + return self._run_conf('--oldconfig', dot_config=dot_config, + interactive=True, in_keys=in_keys) + + def olddefconfig(self, dot_config=None): + """Run olddefconfig. + + dot_config: .config file to use for configuration base (optional) + returncode: exit status of the Kconfig executable + """ + return self._run_conf('--olddefconfig', dot_config=dot_config) + + def defconfig(self, defconfig): + """Run defconfig. + + defconfig: defconfig file for input + returncode: exit status of the Kconfig executable + """ + defconfig_path = os.path.join(self._test_dir, defconfig) + return self._run_conf('--defconfig={}'.format(defconfig_path)) + + def _allconfig(self, mode, all_config): + if all_config: + all_config_path = os.path.join(self._test_dir, all_config) + extra_env = {'KCONFIG_ALLCONFIG': all_config_path} + else: + extra_env = {} + + return self._run_conf('--{}config'.format(mode), extra_env=extra_env) + + def allyesconfig(self, all_config=None): + """Run allyesconfig. + + all_config: fragment config file for KCONFIG_ALLCONFIG (optional) + returncode: exit status of the Kconfig executable + """ + return self._allconfig('allyes', all_config) + + def allmodconfig(self, all_config=None): + """Run allmodconfig. + + all_config: fragment config file for KCONFIG_ALLCONFIG (optional) + returncode: exit status of the Kconfig executable + """ + return self._allconfig('allmod', all_config) + + def allnoconfig(self, all_config=None): + """Run allnoconfig. + + all_config: fragment config file for KCONFIG_ALLCONFIG (optional) + returncode: exit status of the Kconfig executable + """ + return self._allconfig('allno', all_config) + + def alldefconfig(self, all_config=None): + """Run alldefconfig. + + all_config: fragment config file for KCONFIG_ALLCONFIG (optional) + returncode: exit status of the Kconfig executable + """ + return self._allconfig('alldef', all_config) + + def randconfig(self, all_config=None): + """Run randconfig. + + all_config: fragment config file for KCONFIG_ALLCONFIG (optional) + returncode: exit status of the Kconfig executable + """ + return self._allconfig('rand', all_config) + + def savedefconfig(self, dot_config): + """Run savedefconfig. + + dot_config: .config file for input + returncode: exit status of the Kconfig executable + """ + return self._run_conf('--savedefconfig', out_file='defconfig') + + def listnewconfig(self, dot_config=None): + """Run listnewconfig. + + dot_config: .config file to use for configuration base (optional) + returncode: exit status of the Kconfig executable + """ + return self._run_conf('--listnewconfig', dot_config=dot_config, + out_file=None) + + # checkers + def _read_and_compare(self, compare, expected): + """Compare the result with expectation. + + compare: function to compare the result with expectation + expected: file that contains the expected data + """ + with open(os.path.join(self._test_dir, expected)) as f: + expected_data = f.read() + return compare(self, expected_data) + + def _contains(self, attr, expected): + return self._read_and_compare( + lambda s, e: getattr(s, attr).find(e) >= 0, + expected) + + def _matches(self, attr, expected): + return self._read_and_compare(lambda s, e: getattr(s, attr) == e, + expected) + + def config_contains(self, expected): + """Check if resulted configuration contains expected data. + + expected: file that contains the expected data + returncode: True if result contains the expected data, False otherwise + """ + return self._contains('config', expected) + + def config_matches(self, expected): + """Check if resulted configuration exactly matches expected data. + + expected: file that contains the expected data + returncode: True if result matches the expected data, False otherwise + """ + return self._matches('config', expected) + + def stdout_contains(self, expected): + """Check if resulted stdout contains expected data. + + expected: file that contains the expected data + returncode: True if result contains the expected data, False otherwise + """ + return self._contains('stdout', expected) + + def stdout_matches(self, expected): + """Check if resulted stdout exactly matches expected data. + + expected: file that contains the expected data + returncode: True if result matches the expected data, False otherwise + """ + return self._matches('stdout', expected) + + def stderr_contains(self, expected): + """Check if resulted stderr contains expected data. + + expected: file that contains the expected data + returncode: True if result contains the expected data, False otherwise + """ + return self._contains('stderr', expected) + + def stderr_matches(self, expected): + """Check if resulted stderr exactly matches expected data. + + expected: file that contains the expected data + returncode: True if result matches the expected data, False otherwise + """ + return self._matches('stderr', expected) + + +@pytest.fixture(scope="module") +def conf(request): + """Create a Conf instance and provide it to test functions.""" + return Conf(request) diff --git a/scripts/kconfig/tests/pytest.ini b/scripts/kconfig/tests/pytest.ini new file mode 100644 index 0000000..07b94e0 --- /dev/null +++ b/scripts/kconfig/tests/pytest.ini @@ -0,0 +1,6 @@ +[pytest] +addopts = --verbose +# Pytest requires that test files have unique names, because pytest imports +# them as top-level modules. It is silly to prefix or suffix a test file with +# the directory name that contains it. Use __init__.py for all test files. +python_files = __init__.py From patchwork Fri Mar 2 04:31:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130454 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp857301lja; Thu, 1 Mar 2018 20:34:20 -0800 (PST) X-Google-Smtp-Source: AG47ELs6fOlj9DYMZXwWg2N97PCr5eJgCsgn40uAl10dwAJ+DTxelMqzSGlDL2BGH6UWAEDb/q2a X-Received: by 10.98.10.65 with SMTP id s62mr4368422pfi.234.1519965260378; Thu, 01 Mar 2018 20:34:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965260; cv=none; d=google.com; s=arc-20160816; b=G6j4/RIBXUHL0HrsYg9tDKSQcAMttesLUYOQ6fnc1IFhCKUdAY+Z/rDKlZtNjwHtSR 7YTLH6K9JuPDSl6bYsP7iyIxK/pyxm4nbpoeDZGkQZt/O6pKz4UUYPu37cPDtFrQNyUs 5T/3AGIvSYJZHvHUzMKC4Ztl4uIjGMTbMehoYhqGXabUEJfwtcETBizGn5G7UT31iUUf MjJzAtV7FxberzoLgRiO4An4rf/byPTeIt7JHpYFfFhwJRule/yAIkZwb9yzOLLHiJXO j5lbsKaGJ2FYCiYK/lcUWv4ZRYtqOxopleWQyIPpp/60ww0Q5ppubZ6WqcmbiopPFKt2 IDQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=trmUomWqquAd70K6QlPKGy5N/OSWeZYH3eT4qmSTa5M=; b=sqoHRZZJRwGpFcm7K5rUTNErp1QU2Euy9QiNfTFktAlwwVC3lEMdXHTuehsX3UnpGe o7DHKWOCzjfEoOvQN1L1z3oVgmbZzPByaiVTzW4LNXLn2TRcam9RpUyLJ49pmU2IGzQV m037gOyzZsIrgBdpae1jS9t9dzlxOus3nP53RC54TCH2X9ZszvutJPjtzMDxiosNI030 q6WMzaG3oEzEyt6DQ0a6bpkT6B9lKCTbg1hyVhf3Pmox3HkBXZN1h9hXewHpo1Jz7wDu ydmL0aKXyBLn573TKGET6uFaw0OzU9XsLEP9EGEas/ZITXxGL2fc42YSAcU2yokLEu1Q 066Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=C7K8fIZq; 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 y190si3471998pgd.177.2018.03.01.20.34.20; Thu, 01 Mar 2018 20:34:20 -0800 (PST) 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=C7K8fIZq; 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 S1165025AbeCBEd4 (ORCPT + 28 others); Thu, 1 Mar 2018 23:33:56 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53154 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164424AbeCBEdr (ORCPT ); Thu, 1 Mar 2018 23:33:47 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURE022085; Fri, 2 Mar 2018 13:32:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURE022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965153; bh=trmUomWqquAd70K6QlPKGy5N/OSWeZYH3eT4qmSTa5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C7K8fIZqqCh2hm53HqFAyL6bVyphAQkPHmopwIkWZOGgoXxpicPQiRXBYg7O+MqnM O8Y8atvGi9W7bDduRRr5eOkTRBxcY58i/a90oSPhtMApQ3HYqc/J5ebdOEdl0f+VJa caksradZBopE3wPjOG/elc8ffip+CEi7HuLSeT9PN7jnPxB1DniwAxyZe/HtJnbM9G c6ou/wCsHgVeidi3BCriqB/C4ZtZXYLX80qNF5N8zDkWuErxP/a73908vuyt++KLS1 QgUCsJfaR8ImNi7a0LOQMjXO4IN35/J7Q/GLHH/yR8+yBxysxT5Yuh3Ef1AOfopVL1 XUoKlWo347EPg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 03/11] kconfig: unittest: add basic 'choice' tests Date: Fri, 2 Mar 2018 13:31:53 +0900 Message-Id: <1519965121-12017-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The calculation of 'choice' is a bit complicated part in Kconfig. The behavior of 'y' choice is intuitive. If choice values are tristate, the choice can be 'm' where each value can be enabled independently. Also, if a choice is marked as 'optional', the whole choice can be invisible. Test basic functionality of choice. Signed-off-by: Masahiro Yamada Reviewed-by: Ulf Magnusson --- Changes in v2: - coding style clean-up based on PEP8, PEP257 scripts/kconfig/tests/choice/Kconfig | 54 ++++++++++++++++++++++ scripts/kconfig/tests/choice/__init__.py | 40 ++++++++++++++++ .../kconfig/tests/choice/alldef_expected_config | 5 ++ .../kconfig/tests/choice/allmod_expected_config | 9 ++++ scripts/kconfig/tests/choice/allno_expected_config | 5 ++ .../kconfig/tests/choice/allyes_expected_config | 9 ++++ .../kconfig/tests/choice/oldask0_expected_stdout | 10 ++++ scripts/kconfig/tests/choice/oldask1_config | 2 + .../kconfig/tests/choice/oldask1_expected_stdout | 15 ++++++ 9 files changed, 149 insertions(+) create mode 100644 scripts/kconfig/tests/choice/Kconfig create mode 100644 scripts/kconfig/tests/choice/__init__.py create mode 100644 scripts/kconfig/tests/choice/alldef_expected_config create mode 100644 scripts/kconfig/tests/choice/allmod_expected_config create mode 100644 scripts/kconfig/tests/choice/allno_expected_config create mode 100644 scripts/kconfig/tests/choice/allyes_expected_config create mode 100644 scripts/kconfig/tests/choice/oldask0_expected_stdout create mode 100644 scripts/kconfig/tests/choice/oldask1_config create mode 100644 scripts/kconfig/tests/choice/oldask1_expected_stdout -- 2.7.4 diff --git a/scripts/kconfig/tests/choice/Kconfig b/scripts/kconfig/tests/choice/Kconfig new file mode 100644 index 0000000..cc60e9c --- /dev/null +++ b/scripts/kconfig/tests/choice/Kconfig @@ -0,0 +1,54 @@ +config MODULES + bool "Enable loadable module support" + option modules + default y + +choice + prompt "boolean choice" + default BOOL_CHOICE1 + +config BOOL_CHOICE0 + bool "choice 0" + +config BOOL_CHOICE1 + bool "choice 1" + +endchoice + +choice + prompt "optional boolean choice" + optional + default OPT_BOOL_CHOICE1 + +config OPT_BOOL_CHOICE0 + bool "choice 0" + +config OPT_BOOL_CHOICE1 + bool "choice 1" + +endchoice + +choice + prompt "tristate choice" + default TRI_CHOICE1 + +config TRI_CHOICE0 + tristate "choice 0" + +config TRI_CHOICE1 + tristate "choice 1" + +endchoice + +choice + prompt "optional tristate choice" + optional + default OPT_TRI_CHOICE1 + +config OPT_TRI_CHOICE0 + tristate "choice 0" + +config OPT_TRI_CHOICE1 + tristate "choice 1" + +endchoice diff --git a/scripts/kconfig/tests/choice/__init__.py b/scripts/kconfig/tests/choice/__init__.py new file mode 100644 index 0000000..9edcc52 --- /dev/null +++ b/scripts/kconfig/tests/choice/__init__.py @@ -0,0 +1,40 @@ +""" +Basic choice tests. + +The handling of 'choice' is a bit complicated part in Kconfig. + +The behavior of 'y' choice is intuitive. If choice values are tristate, +the choice can be 'm' where each value can be enabled independently. +Also, if a choice is marked as 'optional', the whole choice can be +invisible. +""" + + +def test_oldask0(conf): + assert conf.oldaskconfig() == 0 + assert conf.stdout_contains('oldask0_expected_stdout') + + +def test_oldask1(conf): + assert conf.oldaskconfig('oldask1_config') == 0 + assert conf.stdout_contains('oldask1_expected_stdout') + + +def test_allyes(conf): + assert conf.allyesconfig() == 0 + assert conf.config_contains('allyes_expected_config') + + +def test_allmod(conf): + assert conf.allmodconfig() == 0 + assert conf.config_contains('allmod_expected_config') + + +def test_allno(conf): + assert conf.allnoconfig() == 0 + assert conf.config_contains('allno_expected_config') + + +def test_alldef(conf): + assert conf.alldefconfig() == 0 + assert conf.config_contains('alldef_expected_config') diff --git a/scripts/kconfig/tests/choice/alldef_expected_config b/scripts/kconfig/tests/choice/alldef_expected_config new file mode 100644 index 0000000..7a754bf --- /dev/null +++ b/scripts/kconfig/tests/choice/alldef_expected_config @@ -0,0 +1,5 @@ +CONFIG_MODULES=y +# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE1=y +# CONFIG_TRI_CHOICE0 is not set +# CONFIG_TRI_CHOICE1 is not set diff --git a/scripts/kconfig/tests/choice/allmod_expected_config b/scripts/kconfig/tests/choice/allmod_expected_config new file mode 100644 index 0000000..f1f5dcd --- /dev/null +++ b/scripts/kconfig/tests/choice/allmod_expected_config @@ -0,0 +1,9 @@ +CONFIG_MODULES=y +# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE1=y +# CONFIG_OPT_BOOL_CHOICE0 is not set +CONFIG_OPT_BOOL_CHOICE1=y +CONFIG_TRI_CHOICE0=m +CONFIG_TRI_CHOICE1=m +CONFIG_OPT_TRI_CHOICE0=m +CONFIG_OPT_TRI_CHOICE1=m diff --git a/scripts/kconfig/tests/choice/allno_expected_config b/scripts/kconfig/tests/choice/allno_expected_config new file mode 100644 index 0000000..b88ee7a --- /dev/null +++ b/scripts/kconfig/tests/choice/allno_expected_config @@ -0,0 +1,5 @@ +# CONFIG_MODULES is not set +# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE1=y +# CONFIG_TRI_CHOICE0 is not set +CONFIG_TRI_CHOICE1=y diff --git a/scripts/kconfig/tests/choice/allyes_expected_config b/scripts/kconfig/tests/choice/allyes_expected_config new file mode 100644 index 0000000..e5a062a --- /dev/null +++ b/scripts/kconfig/tests/choice/allyes_expected_config @@ -0,0 +1,9 @@ +CONFIG_MODULES=y +# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE1=y +# CONFIG_OPT_BOOL_CHOICE0 is not set +CONFIG_OPT_BOOL_CHOICE1=y +# CONFIG_TRI_CHOICE0 is not set +CONFIG_TRI_CHOICE1=y +# CONFIG_OPT_TRI_CHOICE0 is not set +CONFIG_OPT_TRI_CHOICE1=y diff --git a/scripts/kconfig/tests/choice/oldask0_expected_stdout b/scripts/kconfig/tests/choice/oldask0_expected_stdout new file mode 100644 index 0000000..b251bba --- /dev/null +++ b/scripts/kconfig/tests/choice/oldask0_expected_stdout @@ -0,0 +1,10 @@ +Enable loadable module support (MODULES) [Y/n/?] (NEW) +boolean choice + 1. choice 0 (BOOL_CHOICE0) (NEW) +> 2. choice 1 (BOOL_CHOICE1) (NEW) +choice[1-2?]: +optional boolean choice [N/y/?] (NEW) +tristate choice [M/y/?] (NEW) + choice 0 (TRI_CHOICE0) [N/m/?] (NEW) + choice 1 (TRI_CHOICE1) [N/m/?] (NEW) +optional tristate choice [N/m/y/?] (NEW) diff --git a/scripts/kconfig/tests/choice/oldask1_config b/scripts/kconfig/tests/choice/oldask1_config new file mode 100644 index 0000000..b67bfe3 --- /dev/null +++ b/scripts/kconfig/tests/choice/oldask1_config @@ -0,0 +1,2 @@ +# CONFIG_MODULES is not set +CONFIG_OPT_BOOL_CHOICE0=y diff --git a/scripts/kconfig/tests/choice/oldask1_expected_stdout b/scripts/kconfig/tests/choice/oldask1_expected_stdout new file mode 100644 index 0000000..c2125e9b --- /dev/null +++ b/scripts/kconfig/tests/choice/oldask1_expected_stdout @@ -0,0 +1,15 @@ +Enable loadable module support (MODULES) [N/y/?] +boolean choice + 1. choice 0 (BOOL_CHOICE0) (NEW) +> 2. choice 1 (BOOL_CHOICE1) (NEW) +choice[1-2?]: +optional boolean choice [Y/n/?] (NEW) +optional boolean choice +> 1. choice 0 (OPT_BOOL_CHOICE0) + 2. choice 1 (OPT_BOOL_CHOICE1) (NEW) +choice[1-2?]: +tristate choice + 1. choice 0 (TRI_CHOICE0) (NEW) +> 2. choice 1 (TRI_CHOICE1) (NEW) +choice[1-2?]: +optional tristate choice [N/y/?] From patchwork Fri Mar 2 04:31:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130459 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp858348lja; Thu, 1 Mar 2018 20:36:02 -0800 (PST) X-Google-Smtp-Source: AG47ELvSLuQmmJCiMfsJ7qQID7qRJRED91fOtLkBjBiEI1uAuz7RPZ/eO3NIU/BwJrg2416yULd8 X-Received: by 10.99.5.197 with SMTP id 188mr3522725pgf.196.1519965362320; Thu, 01 Mar 2018 20:36:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965362; cv=none; d=google.com; s=arc-20160816; b=QEAphA5yrFiDjagAsPqXIyqf0c5yCxanXChrx3Kq4JzOJI8wL7lgYjm8hfBCsiT1YQ oA0n0LPqdosCHlu+7JKpmocUwX+2HWEvSyNZu3KXlzveXpEnG6ECccrmW5Xh8WQcImbf qiY3AhBdUmsrt1VINOlEGNXzIpPwgkChpdotxQxjSJxp+MCOJuNmsz1+dd7zUM/dIcdj hwuv46ANsFyZGV/HjO77+u+UcQxhnqXk6uGjnPRxVmsRqhB236f2GDSG/wUGFdOpgLwU dMH1llJynYFEJsNoX29/9aD4mZSeUPiKhhsLMhmczHH32baDGdKTYV3ggvW+GiP2/b+s MtrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=zSrVCPJ+iYN1cnbLE0MBiGiPcElRE3AhAH1ywAQxF7Q=; b=BcDVbItrFZFJPVSCaXR0k/xrLx9cOf3uf/Ks4f218BtdHuBZQMQyqkTA1OalDWkLuz vWPAsrn1AhmBU9emS48NuvBD+wx0FGjuTCMOouSyrzhcn0K1IvCoWeBCHqomZbSS8Hfn oDenRZO8q0r7vgTY7w1hIkezarCtdPXcp4ZUXvcyvilNkJSYJVrTvLv6uluU/oHw9Lu8 oEb0LqolIDzvr/uvH/COOjI7iy3Bvf2vK+OT8szHdQjK2zFIAQdVCk2SIa0GLUsxoIsL Ol2xRDkNakk3F6hrnbZSS2KZrBAS+8fpkyIG5PW8ZgHNBWPAyny6RWtc7/DsNP1oChCj sg5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=i5x1Nf78; 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 w16-v6si4077946plp.87.2018.03.01.20.36.01; Thu, 01 Mar 2018 20:36:02 -0800 (PST) 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=i5x1Nf78; 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 S1422711AbeCBEfb (ORCPT + 28 others); Thu, 1 Mar 2018 23:35:31 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53189 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164990AbeCBEdr (ORCPT ); Thu, 1 Mar 2018 23:33:47 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURF022085; Fri, 2 Mar 2018 13:32:34 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURF022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965154; bh=zSrVCPJ+iYN1cnbLE0MBiGiPcElRE3AhAH1ywAQxF7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i5x1Nf78zQ7YsnU8KcXUhJcxMItunErtduHwmkk0L1RLgIwq0YdPd6qGSl5wsYIvq J3UEALzX7GGk4RZwH6mASsvdJpFgL0fO2Tsrg+s3dl5xmkxsHz9b0RwCvfxlXy9+3H VSs6SRWl0YvgN9RuVe3Mt29+Gavt7sucVKH+z8OtI8eDKXhUAFQ+Q7Til8hnuRpacS 2eCf3YtBpvqXVWFCyFzeML/mB2/SZDfoRwwRLV6tX0LKo32u3QUIxJpvdp9l5/Edqc tR/sIxcvGxlB7/YHfcAALZ6Szml5w2RN0WjyaIKY5Fe/QqJXM+8+kj7XFUN38xAgvy Jlov/dFAD0CTQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 04/11] kconfig: unittest: test automatic submenu creation Date: Fri, 2 Mar 2018 13:31:54 +0900 Message-Id: <1519965121-12017-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If a symbols has dependency on the preceding symbol, the menu entry should become the submenu of the preceding one, and displayed with deeper indentation. This is done by restructuring the menu tree in menu_finalize(). It is a bit complicated computation, so let's add a test case. Signed-off-by: Masahiro Yamada Reviewed-by: Ulf Magnusson --- Changes in v2: - shorten directory name 'auto_submenu_creation' -> 'auto_submenu' - coding style clean-up based on PEP8, PEP257 scripts/kconfig/tests/auto_submenu/Kconfig | 50 ++++++++++++++++++++++ scripts/kconfig/tests/auto_submenu/__init__.py | 12 ++++++ scripts/kconfig/tests/auto_submenu/expected_stdout | 10 +++++ 3 files changed, 72 insertions(+) create mode 100644 scripts/kconfig/tests/auto_submenu/Kconfig create mode 100644 scripts/kconfig/tests/auto_submenu/__init__.py create mode 100644 scripts/kconfig/tests/auto_submenu/expected_stdout -- 2.7.4 diff --git a/scripts/kconfig/tests/auto_submenu/Kconfig b/scripts/kconfig/tests/auto_submenu/Kconfig new file mode 100644 index 0000000..9e11502 --- /dev/null +++ b/scripts/kconfig/tests/auto_submenu/Kconfig @@ -0,0 +1,50 @@ +config A + bool "A" + default y + +config A0 + bool "A0" + depends on A + default y + help + This depends on A, so should be a submenu of A. + +config A0_0 + bool "A1_0" + depends on A0 + help + Submenus are created recursively. + This should be a submenu of A0. + +config A1 + bool "A1" + depends on A + default y + help + This should line up with A0. + +choice + prompt "choice" + depends on A1 + help + Choice should become a submenu as well. + +config A1_0 + bool "A1_0" + +config A1_1 + bool "A1_1" + +endchoice + +config B + bool "B" + help + This is independent of A. + +config C + bool "C" + depends on A + help + This depends on A, but not a consecutive item, so should not + be a submenu. diff --git a/scripts/kconfig/tests/auto_submenu/__init__.py b/scripts/kconfig/tests/auto_submenu/__init__.py new file mode 100644 index 0000000..32e79b8 --- /dev/null +++ b/scripts/kconfig/tests/auto_submenu/__init__.py @@ -0,0 +1,12 @@ +""" +Create submenu for symbols that depend on the preceding one. + +If a symbols has dependency on the preceding symbol, the menu entry +should become the submenu of the preceding one, and displayed with +deeper indentation. +""" + + +def test(conf): + assert conf.oldaskconfig() == 0 + assert conf.stdout_contains('expected_stdout') diff --git a/scripts/kconfig/tests/auto_submenu/expected_stdout b/scripts/kconfig/tests/auto_submenu/expected_stdout new file mode 100644 index 0000000..bf5236f --- /dev/null +++ b/scripts/kconfig/tests/auto_submenu/expected_stdout @@ -0,0 +1,10 @@ +A (A) [Y/n/?] (NEW) + A0 (A0) [Y/n/?] (NEW) + A1_0 (A0_0) [N/y/?] (NEW) + A1 (A1) [Y/n/?] (NEW) + choice + > 1. A1_0 (A1_0) (NEW) + 2. A1_1 (A1_1) (NEW) + choice[1-2?]: +B (B) [N/y/?] (NEW) +C (C) [N/y/?] (NEW) From patchwork Fri Mar 2 04:31:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130462 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp858778lja; Thu, 1 Mar 2018 20:36:45 -0800 (PST) X-Google-Smtp-Source: AG47ELv8FG1WTAC0qnGESfaWzouBxav1lXhUJPDfXW/7jxDOj1IzrEv+sxbWIkEGSFy7J5+gtHC0 X-Received: by 2002:a17:902:2e83:: with SMTP id r3-v6mr4148189plb.84.1519965405226; Thu, 01 Mar 2018 20:36:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965405; cv=none; d=google.com; s=arc-20160816; b=qD8ySqlEt2g5Xvj/n6oq2NjD9kppSvpJLsB5dVvHXELr2t7rE/kqPdw4KAblV6jz0n h+LEWKbgFyiNMtdfRKIcsqRRMnJtM9GG50lJUrDa8Me7Ded7pt1susk3OGj/uHJcvVyU Zv+eVPqmHEZgbDBFoziVnl63H6rmbx1k5uD7z6idyhqPGG9o1CmSufhGyjGepM+txrW8 sgaZ5m0PNUOuHwzCqYURytb9RRhSMpJ2jyY8XujmQZeALtRxStlycdN2LtFg3or+hVGa lCuXMiYrQqFqrDp3uDYHMFO5NoR6ou8N6zqJOnYARLL5yXQkG6VSGBjSl94zcItMA8Ux Po/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=CIgyADcpoO0K4EjFo7YjMYB6IgXXC6HyzO1sbrgeduo=; b=UEo+xeBt+LITM76X6aetNmuzvAewG8AjsPGM7DhRHKx9A5El7mTdnsO+o8KWfK+T0X 79xl0w2CJgqKzEQ7dUzTJU0ZH/WVkl/FVClnPyVO0toBGkvTcjlCbJpMHNwKwsqltgaA ZzapIubsTzViwH3GY0vLKzpKI9LkRJyk9SQlfwoeWtHqiu9C8RXahFIZP7pwYaKN3mAK 4S7B9vLMyz1PN7mQ/t5g3i3RaPyT9jakAKPNlAPAItQ620UPzX8/b7xOGP3ZsNTbjIGi 3vqtiJEVuNPXC18eirhB+4odDi74au616hAtt/mOEnp1+FlLvNwxEwfeD8rTv78ymScL ZztQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Ei9pojNn; 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 w12si2687001pgs.511.2018.03.01.20.36.44; Thu, 01 Mar 2018 20:36:45 -0800 (PST) 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=Ei9pojNn; 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 S1422771AbeCBEg0 (ORCPT + 28 others); Thu, 1 Mar 2018 23:36:26 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53156 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164988AbeCBEdr (ORCPT ); Thu, 1 Mar 2018 23:33:47 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURG022085; Fri, 2 Mar 2018 13:32:34 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURG022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965155; bh=CIgyADcpoO0K4EjFo7YjMYB6IgXXC6HyzO1sbrgeduo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ei9pojNn9JMI+P1jcTv9Yhh3ryrdrrHQ/jceOsTpGRR5zyAmPB5a9y3q7YdyQgBxG J9Ozhp/ALSahzK3DtQc9H0f2Kre8i9UeIXRIkH+pAr1RgbMyuDS9IMg7f7sKt/xoEW 2rb8aBuZ+HWOdagPLeTY4HplFCnmyPABuwjcditqXHASOfyPgNXhomuZcmkSCjDO+h WgKpuPsbHOo4Hx53gNV7twgXkdhbs4IJRJ8bpW0jimKHKTl0thdtux+tuEylXsKw+f T28Zr+Df/IIcB/ZFYa6fabf4ooFLLvlJjVea0ZYXqKeZIgYHp6E3/KKsd9eS2E+1y1 Nxsi5GUpNKH+A== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 05/11] kconfig: unittest: test if new symbols in choice are asked Date: Fri, 2 Mar 2018 13:31:55 +0900 Message-Id: <1519965121-12017-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If new choice values are added with new dependency, and they become visible during user configuration, oldconfig should recognize them as (NEW), and ask the user for choice. This issue was fixed by commit 5d09598d488f ("kconfig: fix new choices being skipped upon config update"). This is a subtle corner case. Add a test case to avoid breakage. Signed-off-by: Masahiro Yamada Reviewed-by: Ulf Magnusson --- Changes in v2: - coding style clean-up based on PEP8, PEP257 scripts/kconfig/tests/new_choice_with_dep/Kconfig | 37 ++++++++++++++++++++++ .../kconfig/tests/new_choice_with_dep/__init__.py | 14 ++++++++ scripts/kconfig/tests/new_choice_with_dep/config | 3 ++ .../tests/new_choice_with_dep/expected_stdout | 10 ++++++ 4 files changed, 64 insertions(+) create mode 100644 scripts/kconfig/tests/new_choice_with_dep/Kconfig create mode 100644 scripts/kconfig/tests/new_choice_with_dep/__init__.py create mode 100644 scripts/kconfig/tests/new_choice_with_dep/config create mode 100644 scripts/kconfig/tests/new_choice_with_dep/expected_stdout -- 2.7.4 diff --git a/scripts/kconfig/tests/new_choice_with_dep/Kconfig b/scripts/kconfig/tests/new_choice_with_dep/Kconfig new file mode 100644 index 0000000..53ef1b8 --- /dev/null +++ b/scripts/kconfig/tests/new_choice_with_dep/Kconfig @@ -0,0 +1,37 @@ +config A + bool "A" + help + This is a new symbol. + +choice + prompt "Choice ?" + depends on A + help + "depends on A" has been newly added. + +config CHOICE_B + bool "Choice B" + +config CHOICE_C + bool "Choice C" + help + This is a new symbol, so should be asked. + +endchoice + +choice + prompt "Choice2 ?" + +config CHOICE_D + bool "Choice D" + +config CHOICE_E + bool "Choice E" + +config CHOICE_F + bool "Choice F" + depends on A + help + This is a new symbol, so should be asked. + +endchoice diff --git a/scripts/kconfig/tests/new_choice_with_dep/__init__.py b/scripts/kconfig/tests/new_choice_with_dep/__init__.py new file mode 100644 index 0000000..f0e0ead --- /dev/null +++ b/scripts/kconfig/tests/new_choice_with_dep/__init__.py @@ -0,0 +1,14 @@ +""" +Ask new choice values when they become visible. + +If new choice values are added with new dependency, and they become +visible during user configuration, oldconfig should recognize them +as (NEW), and ask the user for choice. + +Related Linux commit: 5d09598d488f081e3be23f885ed65cbbe2d073b5 +""" + + +def test(conf): + assert conf.oldconfig('config', 'y') == 0 + assert conf.stdout_contains('expected_stdout') diff --git a/scripts/kconfig/tests/new_choice_with_dep/config b/scripts/kconfig/tests/new_choice_with_dep/config new file mode 100644 index 0000000..47ef95d --- /dev/null +++ b/scripts/kconfig/tests/new_choice_with_dep/config @@ -0,0 +1,3 @@ +CONFIG_CHOICE_B=y +# CONFIG_CHOICE_D is not set +CONFIG_CHOICE_E=y diff --git a/scripts/kconfig/tests/new_choice_with_dep/expected_stdout b/scripts/kconfig/tests/new_choice_with_dep/expected_stdout new file mode 100644 index 0000000..74dc0bc --- /dev/null +++ b/scripts/kconfig/tests/new_choice_with_dep/expected_stdout @@ -0,0 +1,10 @@ +A (A) [N/y/?] (NEW) y + Choice ? + > 1. Choice B (CHOICE_B) + 2. Choice C (CHOICE_C) (NEW) + choice[1-2?]: +Choice2 ? + 1. Choice D (CHOICE_D) +> 2. Choice E (CHOICE_E) + 3. Choice F (CHOICE_F) (NEW) +choice[1-3?]: From patchwork Fri Mar 2 04:31:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130460 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp858465lja; Thu, 1 Mar 2018 20:36:14 -0800 (PST) X-Google-Smtp-Source: AG47ELv+CPr0GeW9dLkiXMW2rZ0wgAI3Tt36wrYz087tQh86CcWiYfK0IO8DYVqBnP9ed30Z59FL X-Received: by 2002:a17:902:ab8f:: with SMTP id f15-v6mr4113212plr.214.1519965373890; Thu, 01 Mar 2018 20:36:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965373; cv=none; d=google.com; s=arc-20160816; b=EucseOT/+9zzKdaQOGwD7VjRW17qzbxAdhbgIEZ5ppRZdjPt9fFmNzp9fU5DRRVCIi +W1/eqZxKU+X4iofPPHgchFZ5UE5Epd2bOs1cl8Kw+aWwnVxbRzrM80Po2V11idTvnPD ABdaLTsD8oRH9jnaNqRX9LmNE/kD/KY5zRI6CF/u3j4nYIQE+0SCJFWcTQUSETduRb+7 TUCJ8wIWSYXRlITtkVpTrZFd2cwzbb8SywnavZSIQUYCTGEAPYtheFHXj6so5rvgsWYP GDcwludNqy1UEMxFr71kURAVz/KtgbRiWSaiYZ+YMU1ec7ZF6CxE/WNm7jCUshgMWFiC sIPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=YHlYGf4K4v1ahFqlIfSIY0z7Pp4emSL3/A4X48tqt5U=; b=BXjXtlvJA4a23EkLjQqOBjq4kmi/wybkzbirh+2fOTN+Y/XISCQQxOy63qeM0AEa1P GY/33cQsEEiQLDycTIeauEMJ9NgeWS9YcDTQbRLXz7nMXFT2mv35twmZvyemkueQb9LI P/kl2SuPiukW6qr6Dj7rhKUGSqFzt9+UApkuPYjpL3W051qbj+8TvQte6Ki9RX/Dgz3b Ga+NDhgpGW+l0XqxZwghUXXVUXzi6pMDlUMUJH8KBoC9gNj2vWeP2V3bfNsv4Zp+FlTJ XmIwNKVSRW5qivsi5HA7iCiy/qBddPNYNUb5WDXRcXU1SAQSeDljmoK7yGEn9u4Bd4pm Y6Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=RCmoy2nL; 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 w16-v6si4077946plp.87.2018.03.01.20.36.13; Thu, 01 Mar 2018 20:36:13 -0800 (PST) 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=RCmoy2nL; 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 S1422698AbeCBEf3 (ORCPT + 28 others); Thu, 1 Mar 2018 23:35:29 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53187 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164991AbeCBEdr (ORCPT ); Thu, 1 Mar 2018 23:33:47 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURH022085; Fri, 2 Mar 2018 13:32:35 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURH022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965156; bh=YHlYGf4K4v1ahFqlIfSIY0z7Pp4emSL3/A4X48tqt5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RCmoy2nLtR3hzN2V8tShelNQzssgM+wPt2pmZi8LJ8MJFVj0wzd5EReXI3Uce8maA bEwJRbCK7yRrBIpKszzZ86EVBltYjarvTKy6eqxaSbC2uKDa1Qf/eMJ2gm8wH0ya9U 8t/dYNzGfy7ESWlgUvTftSi6GF7NLKT3SdaSJa9utQGxvvIFeCI7v8DfI8rBHnbdLv VfU9eiJx10GXAWQBHeSenDwMC8NsmE7KlQH4jezOT7Hw9LyotJOjsB5SK9vIcVV8mW uul/uu6RVUQynCs0B732eIlm367QQzN4oq7fDrS3lowDfeqD/7Oah5LkFBJkuE2W2g bGQAp9nmnnAGw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 06/11] kconfig: unittest: check unneeded "is not set" with unmet dependency Date: Fri, 2 Mar 2018 13:31:56 +0900 Message-Id: <1519965121-12017-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit cb67ab2cd2b8 ("kconfig: do not write choice values when their dependency becomes n") fixed a problem where "# CONFIG_... is not set" for choice values are wrongly written into the .config file when they are once visible, then become invisible later. Add a test for this naive case. Signed-off-by: Masahiro Yamada Reviewed-by: Ulf Magnusson --- Changes in v2: - coding style clean-up based on PEP8, PEP257 scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig | 14 ++++++++++++++ .../kconfig/tests/no_write_if_dep_unmet/__init__.py | 19 +++++++++++++++++++ scripts/kconfig/tests/no_write_if_dep_unmet/config | 1 + .../tests/no_write_if_dep_unmet/expected_config | 5 +++++ 4 files changed, 39 insertions(+) create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/config create mode 100644 scripts/kconfig/tests/no_write_if_dep_unmet/expected_config -- 2.7.4 diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig b/scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig new file mode 100644 index 0000000..c00b8fe --- /dev/null +++ b/scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig @@ -0,0 +1,14 @@ +config A + bool "A" + +choice + prompt "Choice ?" + depends on A + +config CHOICE_B + bool "Choice B" + +config CHOICE_C + bool "Choice C" + +endchoice diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py b/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py new file mode 100644 index 0000000..207261b --- /dev/null +++ b/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py @@ -0,0 +1,19 @@ +""" +Do not write choice values to .config if the dependency is unmet. + +"# CONFIG_... is not set" should not be written into the .config file +for symbols with unmet dependency. + +This was not working correctly for choice values because choice needs +a bit different symbol computation. + +This checks that no unneeded "# COFIG_... is not set" is contained in +the .config file. + +Related Linux commit: cb67ab2cd2b8abd9650292c986c79901e3073a59 +""" + + +def test(conf): + assert conf.oldaskconfig('config', 'n') == 0 + assert conf.config_matches('expected_config') diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/config b/scripts/kconfig/tests/no_write_if_dep_unmet/config new file mode 100644 index 0000000..abd280e --- /dev/null +++ b/scripts/kconfig/tests/no_write_if_dep_unmet/config @@ -0,0 +1 @@ +CONFIG_A=y diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/expected_config b/scripts/kconfig/tests/no_write_if_dep_unmet/expected_config new file mode 100644 index 0000000..0d15e41 --- /dev/null +++ b/scripts/kconfig/tests/no_write_if_dep_unmet/expected_config @@ -0,0 +1,5 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux Kernel Configuration +# +# CONFIG_A is not set From patchwork Fri Mar 2 04:31:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130452 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp857085lja; Thu, 1 Mar 2018 20:33:59 -0800 (PST) X-Google-Smtp-Source: AG47ELvWUCKoZm9X+DXBnZgYNcf80L1ME+tng16VC883Qv1v/9+DMRGfAGB40T/m2o1vNK4qj7Mc X-Received: by 2002:a17:902:5e3:: with SMTP id f90-v6mr4107288plf.413.1519965239777; Thu, 01 Mar 2018 20:33:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965239; cv=none; d=google.com; s=arc-20160816; b=FWslguQmipENAOHfaccR0JXa0qXe8GwboaBSxdpky8OE1xTbQnmpHGQrG3TsAr2t2s GhX9fMgbm1Dq+YuzNTfxcXj7Z/WUpOQPWBp9VMZjVObsJV43I8f8uHAQe+/Uauyx12xH 90xGAO4aCnlyDsze1WQJOB2is/S1GIqO45O5ucsUin9va3pksXgvs9nlcLYCp/HP0eqk /SvchSWMswkXZho/1oaXx4ac+T84sNv433cCPlK7R2u7TSftt+wrhCf/HYaJzUDGE9j+ lmt4EEM/dk+t9xO4JvkEi71UiE2sR90BB4Nq3dgK/9b0xZ3uj2Ps956W9Z2n/XiabvRx II0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=g8R2tmpmVk72gaUbP+xvvOZaMYd+D3hhIOdaQcR3bNA=; b=bKWqVW+UCzBGHXDiPU+SqQEiMt3SrRKeAJd1iM8EFA/9gdzqb9rvclqIt65BdTtgjZ fM1rLHzZwdWdaedAh9/xKYStQlclOyRI7I+yDSZZoDZ3rMbRs/QpxMuIB6+Ys2RbZKvp BT/IU4W4pT//F1EK7+uqA+lgZT0Z81XoygfXG9UjdjJZFQXCvGnq2XhjbYUJkEQvD6cp RpM87zdA5MACQLAKaC7FyPHoUxZa4fYY89YrrWGNFD0OV7keyW7fozoMpR0N73Ghiqcx yLRi4zNcmD8rq9US882N3nL2WTc2xhL1CkkP6kTzK1j2d8idULRszlc6i8vj8qY9gElM kLjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ivHnsPhl; 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 x4si3429293pgo.278.2018.03.01.20.33.59; Thu, 01 Mar 2018 20:33:59 -0800 (PST) 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=ivHnsPhl; 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 S1165011AbeCBEdu (ORCPT + 28 others); Thu, 1 Mar 2018 23:33:50 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53157 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164417AbeCBEdr (ORCPT ); Thu, 1 Mar 2018 23:33:47 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURI022085; Fri, 2 Mar 2018 13:32:36 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURI022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965156; bh=g8R2tmpmVk72gaUbP+xvvOZaMYd+D3hhIOdaQcR3bNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ivHnsPhlHm22WygAUVBN94ISQTp9dw/60ru74+AfruoeQcQ8ElTuweFHsWIoZOu06 b3FYQAixmBDzxo8kt7F2uggHcBW7NE9Nw5TjR9PuiL4E5VrR2uYHkwOLsb7q7PL/Qf b8Cjb4PINXc4zkHu2CWOAtU8uMi60gZyTVKvyfJ4v6UjRSHtc2QnO6fqFr8pmEraiL 2jkiPdbwxhghf/U4e8Nz0qH1vzlgNZ8jhG8X5OhN2sx0PJm+K1TpGfF7wqyMhvTRwZ YdXIJkz5J8qIwPoIrZFUd+x1B82dMaamCJr1Zg3RvWKbFL03JSaTKHibQ84Go2++91 d4DBAafzcT4fw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 07/11] kconfig: unittest: check visibility of tri-choice values in y choice Date: Fri, 2 Mar 2018 13:31:57 +0900 Message-Id: <1519965121-12017-8-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If tristate choice values depend on symbols set to 'm', they should be hidden when the choice containing them is changed from 'm' to 'y' (i.e. exclusive choice). This issue was fixed by commit fa64e5f6a35e ("kconfig/symbol.c: handle choice_values that depend on 'm' symbols"). Add a test case to avoid regression. For the input in this unit test, there is a room for argument if "# CONFIG_CHOICE1 is not set" should be written to the .config file. After commit fa64e5f6a35e, this line was written to the .config file. With commit cb67ab2cd2b8 ("kconfig: do not write choice values when their dependency becomes n"), it is not written now. In this test, "# CONFIG_CHOICE1 is not set" is don't care. Signed-off-by: Masahiro Yamada Reviewed-by: Ulf Magnusson --- Changes in v2: - coding style clean-up based on PEP8, PEP257 .../kconfig/tests/choice_value_with_m_dep/Kconfig | 20 ++++++++++++++++++++ .../tests/choice_value_with_m_dep/__init__.py | 15 +++++++++++++++ scripts/kconfig/tests/choice_value_with_m_dep/config | 2 ++ .../tests/choice_value_with_m_dep/expected_config | 3 +++ .../tests/choice_value_with_m_dep/expected_stdout | 4 ++++ 5 files changed, 44 insertions(+) create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/Kconfig create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/__init__.py create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/config create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/expected_config create mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout -- 2.7.4 diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig b/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig new file mode 100644 index 0000000..dbc49e2 --- /dev/null +++ b/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig @@ -0,0 +1,20 @@ +config MODULES + bool + default y + option modules + +config DEP + tristate + default m + +choice + prompt "Tristate Choice" + +config CHOICE0 + tristate "Choice 0" + +config CHOICE1 + tristate "Choice 1" + depends on DEP + +endchoice diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/__init__.py b/scripts/kconfig/tests/choice_value_with_m_dep/__init__.py new file mode 100644 index 0000000..f8d728c --- /dev/null +++ b/scripts/kconfig/tests/choice_value_with_m_dep/__init__.py @@ -0,0 +1,15 @@ +""" +Hide tristate choice values with mod dependency in y choice. + +If tristate choice values depend on symbols set to 'm', they should be +hidden when the choice containing them is changed from 'm' to 'y' +(i.e. exclusive choice). + +Related Linux commit: fa64e5f6a35efd5e77d639125d973077ca506074 +""" + + +def test(conf): + assert conf.oldaskconfig('config', 'y') == 0 + assert conf.config_contains('expected_config') + assert conf.stdout_contains('expected_stdout') diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/config b/scripts/kconfig/tests/choice_value_with_m_dep/config new file mode 100644 index 0000000..3a126b7 --- /dev/null +++ b/scripts/kconfig/tests/choice_value_with_m_dep/config @@ -0,0 +1,2 @@ +CONFIG_CHOICE0=m +CONFIG_CHOICE1=m diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/expected_config b/scripts/kconfig/tests/choice_value_with_m_dep/expected_config new file mode 100644 index 0000000..4d07b44 --- /dev/null +++ b/scripts/kconfig/tests/choice_value_with_m_dep/expected_config @@ -0,0 +1,3 @@ +CONFIG_MODULES=y +CONFIG_DEP=m +CONFIG_CHOICE0=y diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout b/scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout new file mode 100644 index 0000000..2b50ab6 --- /dev/null +++ b/scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout @@ -0,0 +1,4 @@ +Tristate Choice [M/y/?] y +Tristate Choice +> 1. Choice 0 (CHOICE0) +choice[1]: 1 From patchwork Fri Mar 2 04:31:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130463 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp858886lja; Thu, 1 Mar 2018 20:36:57 -0800 (PST) X-Google-Smtp-Source: AG47ELuvk9nE0fxaYClKF/Oo3Yfz57owsadOJVxZrCUH10KvgGhzYcMG8nzpZxzWhLKlEnA+19uT X-Received: by 2002:a17:902:1486:: with SMTP id k6-v6mr4215392pla.376.1519965417150; Thu, 01 Mar 2018 20:36:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965417; cv=none; d=google.com; s=arc-20160816; b=0egrcgSZDZ4rZYOlxevMdcS2RoUVjI7Lkt9nf/MMsDmrv5ppNoCeSSS5o4sdsITH5C xrhByTJMvQht2U+WjEfX+ilVCBXDc7hHsYQkF6bl8q0McHlAWiLpAMM8F5r3ACrIURPx mijeVT1hnjZuhR4L05bZVR1voGxSf7V9SKJUGREkz/WDzN4NyPKhtIMwKPhG6rlo/tre i2oRosGpIbwodWOyuX8zy8SYMIYyxgLPnRHClykKq30RUUX2g9fqezbJCzNev/+qXmQ7 3mQRrIV7u13y/MK5/YrfnmAPy11HyQd7q6NCCn1yy1qhIclDgE5c4heKWxi9R+TOSvx3 WeyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=3XisxRvHTbi0hGrJpl0Mw57UQMYPCqtZhDqgSx/2BTc=; b=iHZwYVL9XpZpkKmCQVhSMHdEGkmuGTFstEKmRvXo6211FdV2zSAp/utCqXv9Fk29R9 M8Qf9QAUDoT7aqmjPikHDkOUgnsNtrf3+54VbpYyDdU2rZ0BHXQJvpqtxopBCQDkhC/3 rqeQt8u3q/iQP8bJ1hrd6hc6lYCjCEWn1H1NPf2wuwWB6YtXGR7gQ7PPMaNuXpxHtQ5b fTzW7Ujn/TCLhfoQ6PYbq0MOYfbaHlWPrK27aIXc5MlRXjl9hh5yv6XOjdUiBnhXCpWi jooZbo+2i301iqEaz52ENPhNsWeh4QHj9zx7DS0kNb1MxFyDuLw78EDSuEYuo5mfkAS6 5TSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=AjRoeyuT; 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 y38-v6si4199690plh.448.2018.03.01.20.36.56; Thu, 01 Mar 2018 20:36:57 -0800 (PST) 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=AjRoeyuT; 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 S1422757AbeCBEgY (ORCPT + 28 others); Thu, 1 Mar 2018 23:36:24 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53163 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164987AbeCBEdr (ORCPT ); Thu, 1 Mar 2018 23:33:47 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURJ022085; Fri, 2 Mar 2018 13:32:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURJ022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965157; bh=3XisxRvHTbi0hGrJpl0Mw57UQMYPCqtZhDqgSx/2BTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AjRoeyuTuwGcs2uejyOGDmxGMXzDPzfIK0WZ/aspThM5FOF4Ygdn+XGhcoVT99ml4 1aT+VL/O0Gl3U61uwgpTuUxDAoRr92Xyh7b+nn5E0434W8/SffW2SWw33RCfvWCYzL EVBsrcfg0X/sK8APvsUEk7Ii8TesDG0UbuR1ms0kdlM1oRB4Hy7ekw2yXnyjy3QiGy 0PryKky3d6JYxVMRG2VE0yhgVQUJxlJfQu91nzMvnxHs/hUBdSBwgMAcaYVo8uh+OM mLabiyUUdViQ+aWwUjnoOJPI2pATTRMfLGGIaUe4Q8mQQdiT9mV1+EHmEX7rMp13jq ljffhZYQdqz+g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 08/11] kconfig: unittest: test defconfig when two choices interact Date: Fri, 2 Mar 2018 13:31:58 +0900 Message-Id: <1519965121-12017-9-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit fbe98bb9ed3d ("kconfig: Fix defconfig when one choice menu selects options that another choice menu depends on") fixed defconfig when two choices interact (i.e. calculating the visibility of a choice requires to calculate another choice). The test code in that commit log was based on the real world example, and complicated. So, I shrunk it down to the following: defconfig.choice: ---8<--- CONFIG_CHOICE_VAL0=y ---8<--- ---8<--- config MODULES bool "Enable loadable module support" option modules default y choice prompt "Choice" config CHOICE_VAL0 tristate "Choice 0" config CHOICE_VAL1 tristate "Choice 1" endchoice choice prompt "Another choice" depends on CHOICE_VAL0 config DUMMY bool "dummy" endchoice ---8<--- Prior to commit fbe98bb9ed3d, $ scripts/kconfig/conf --defconfig=defconfig.choice Kconfig.choice resulted in: CONFIG_MODULES=y CONFIG_CHOICE_VAL0=m # CONFIG_CHOICE_VAL1 is not set CONFIG_DUMMY=y where the expected result would be: CONFIG_MODULES=y CONFIG_CHOICE_VAL0=y # CONFIG_CHOICE_VAL1 is not set CONFIG_DUMMY=y Roughly, this weird behavior happened like this: Symbols are calculated a couple of times. First, all symbols are calculated in conf_read(). The first 'choice' is evaluated to 'y' due to the SYMBOL_DEF_USER flag, but sym_calc_choice() clears it unless all of its choice values are explicitly set by the user. conf_set_all_new_symbols() clears all SYMBOL_VALID flags. Then, only choices are calculated. At this point, the SYMBOL_DEF_USER for the first choice is unset, so, it is evaluated to 'm'. (this is weird) set_all_choice_values() sets SYMBOL_DEF_USER again to choice symbols. When calculating the second choice, due to 'depends on CHOICE_VAL0', it triggers the calculation of CHOICE_VAL0. As a result, SYMBOL_VALID is set for CHOICE_VAL0. Symbols except choices get the final chance of re-calculation in conf_write(). In a normal case, CHOICE_VAL0 would be re-caluculated, then the first choice would be indirectly re-calculated with the SYMBOL_DEF_USER which has been set by set_all_choice_values(), which would be evaluated to 'y'. But, in this case, CHOICE_VAL0 has been marked SYMBOL_VALID, so it is simply skipped. Then, =m is written out to the .config file. Add a unit test for this naive case. Signed-off-by: Masahiro Yamada --- Changes in v2: - Newly added scripts/kconfig/tests/inter_choice/Kconfig | 24 ++++++++++++++++++++++ scripts/kconfig/tests/inter_choice/__init__.py | 14 +++++++++++++ scripts/kconfig/tests/inter_choice/defconfig | 1 + scripts/kconfig/tests/inter_choice/expected_config | 4 ++++ 4 files changed, 43 insertions(+) create mode 100644 scripts/kconfig/tests/inter_choice/Kconfig create mode 100644 scripts/kconfig/tests/inter_choice/__init__.py create mode 100644 scripts/kconfig/tests/inter_choice/defconfig create mode 100644 scripts/kconfig/tests/inter_choice/expected_config -- 2.7.4 Reviewed-by: Ulf Magnusson diff --git a/scripts/kconfig/tests/inter_choice/Kconfig b/scripts/kconfig/tests/inter_choice/Kconfig new file mode 100644 index 0000000..57d55c4 --- /dev/null +++ b/scripts/kconfig/tests/inter_choice/Kconfig @@ -0,0 +1,24 @@ +config MODULES + bool "Enable loadable module support" + option modules + default y + +choice + prompt "Choice" + +config CHOICE_VAL0 + tristate "Choice 0" + +config CHOIVE_VAL1 + tristate "Choice 1" + +endchoice + +choice + prompt "Another choice" + depends on CHOICE_VAL0 + +config DUMMY + bool "dummy" + +endchoice diff --git a/scripts/kconfig/tests/inter_choice/__init__.py b/scripts/kconfig/tests/inter_choice/__init__.py new file mode 100644 index 0000000..5c7fc36 --- /dev/null +++ b/scripts/kconfig/tests/inter_choice/__init__.py @@ -0,0 +1,14 @@ +""" +Do not affect user-assigned choice value by another choice. + +Handling of state flags for choices is complecated. In old days, +the defconfig result of a choice could be affected by another choice +if those choices interact by 'depends on', 'select', etc. + +Related Linux commit: fbe98bb9ed3dae23e320c6b113e35f129538d14a +""" + + +def test(conf): + assert conf.defconfig('defconfig') == 0 + assert conf.config_contains('expected_config') diff --git a/scripts/kconfig/tests/inter_choice/defconfig b/scripts/kconfig/tests/inter_choice/defconfig new file mode 100644 index 0000000..162c414 --- /dev/null +++ b/scripts/kconfig/tests/inter_choice/defconfig @@ -0,0 +1 @@ +CONFIG_CHOICE_VAL0=y diff --git a/scripts/kconfig/tests/inter_choice/expected_config b/scripts/kconfig/tests/inter_choice/expected_config new file mode 100644 index 0000000..5dceefb --- /dev/null +++ b/scripts/kconfig/tests/inter_choice/expected_config @@ -0,0 +1,4 @@ +CONFIG_MODULES=y +CONFIG_CHOICE_VAL0=y +# CONFIG_CHOIVE_VAL1 is not set +CONFIG_DUMMY=y From patchwork Fri Mar 2 04:31:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130457 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp858101lja; Thu, 1 Mar 2018 20:35:40 -0800 (PST) X-Google-Smtp-Source: AG47ELs96ljBoDLuhYiULQTvvzVxqnBd9SIkMVZQI81grUOU/qGMtnfEksKl5e+Rupo/EeRkrcRh X-Received: by 2002:a17:902:7182:: with SMTP id b2-v6mr4049224pll.331.1519965340099; Thu, 01 Mar 2018 20:35:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965340; cv=none; d=google.com; s=arc-20160816; b=A2QVGYZSW2aB1mhOZLJgNdplNB8TccA1Ofe6/+eAAQQgRYMRvLnJo5265ibjiAM26D si5GclSAubBEPagaDokMwGhiJrr1U3pgjsXWlBAw8XNAxWiKJ7nbs3iznsq8V/JHfiyZ y2R3I6U7odmwxAwaM6e38xYRLs9Je5ZmDvSLB5nGH2THWKRHAHXM8LRQFXltOI07tH/Y kBAfy81mQ7jRPNtxyRbbcQOrnOYhcL8bLWV3nIKZP0NsbBh/EcbUsL8rZWzS15HnbsIs 5oRCw3yCnolDUrrvaEdiP+lUdWxYc6d3fP9zmasmcuASAxPhIZI2/IHyqU/BkJfe79Vx YrsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=PeVeQIJ7t2R3NqLMu1w3DN0G/A3DemmEpE+OC6wHaqg=; b=dYCor00RbsvUiMY+5PjtBpSTSj1ZxIAamjHDvogWAyRoaOvX2zZJY5cVQIbCHpYxTS 0KsdzyEVEBt55m2DhV20hzyMfgMqIeHCxydbvQ5ExoYJst1ipvMdgfWZP1plyxLpjMqq yX2SOecxgqvdtQbqnWErxCHqWX5E6MVZEL/Vj2d+s/e/nQ5WlR5YPTcYiYBEvbiQI6jO gT1ZTIJkcjBQMxAQ+CE66W/92M93xjAls6IUC+aSqmpnS8bV3X87RnCOg6sI4yj+S99G GYriswtwxYg8BBI5EhY6fby3pGr7d9VLft6YCveMBx6un7dhjlLieLExcPM3r3Q0DRo/ zMgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ylqVb7Ac; 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 r20si4229936pfk.125.2018.03.01.20.35.39; Thu, 01 Mar 2018 20:35:40 -0800 (PST) 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=ylqVb7Ac; 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 S1422742AbeCBEfe (ORCPT + 28 others); Thu, 1 Mar 2018 23:35:34 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53186 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164989AbeCBEdr (ORCPT ); Thu, 1 Mar 2018 23:33:47 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURK022085; Fri, 2 Mar 2018 13:32:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURK022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965158; bh=PeVeQIJ7t2R3NqLMu1w3DN0G/A3DemmEpE+OC6wHaqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ylqVb7AcFJkJmcJLYhJpa+eOCc7FGP8flwvayaGaWiNCzv71nn8J7HnNSWOP5JCD9 7gIIx2hE4DqxeGZLKRTMPea5zdzpTxO7a/j+uLz7MQ3oPBJPvLhsuJxIgeA+lzO2QY 5SPlApwroVNnFMTMwlkWj/XR0tzBFtmyb5Lpt/vq7c4sxe+MEyem5MCeGOboKH9Rg5 zEKflRgo++Hp0MwLnKu6GNlkxaukzLBPGUjQ8LQptIxko0jaiLdXwOFt/rpW9aXLsN OKRjYZBXzedNV/RA2dS3NLmLy/pdMM/SsSw30Bhn51yppVK/Mp768D9A+57noMUtHG 7j6hH6bmj81zg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 09/11] kconfig: unittest: test randconfig for choice in choice Date: Fri, 2 Mar 2018 13:31:59 +0900 Message-Id: <1519965121-12017-10-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 3b9a19e08960 ("kconfig: loop as long as we changed some symbols in randconfig") fixed randconfig where a choice contains a sub-choice. Prior to that commit, the sub-choice values were not set. This is complicated usage, but it is still used in the real world; drivers/usb/gadget/legacy/Kconfig is source'd in a choice context, then creates a sub-choice in it. For the test case in this commit, there are 3 possible results. Case 1: CONFIG_A=y # CONFIG_B is not set Case 2: # CONFIG_A is not set CONFIG_B=y CONFIG_C=y # CONFIG_D is not set Case 3: # CONFIG_A is not set CONFIG_B=y # CONFIG_C is not set CONFIG_D=y CONFIG_E=y So, this test iterates several times, and checks if the result is either of the three. Signed-off-by: Masahiro Yamada --- Changes in v2: - Newly added scripts/kconfig/tests/rand_nested_choice/Kconfig | 33 ++++++++++++++++++++++ .../kconfig/tests/rand_nested_choice/__init__.py | 16 +++++++++++ .../tests/rand_nested_choice/expected_stdout0 | 2 ++ .../tests/rand_nested_choice/expected_stdout1 | 4 +++ .../tests/rand_nested_choice/expected_stdout2 | 5 ++++ 5 files changed, 60 insertions(+) create mode 100644 scripts/kconfig/tests/rand_nested_choice/Kconfig create mode 100644 scripts/kconfig/tests/rand_nested_choice/__init__.py create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout0 create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout1 create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout2 -- 2.7.4 Reviewed-by: Ulf Magnusson diff --git a/scripts/kconfig/tests/rand_nested_choice/Kconfig b/scripts/kconfig/tests/rand_nested_choice/Kconfig new file mode 100644 index 0000000..c591d51 --- /dev/null +++ b/scripts/kconfig/tests/rand_nested_choice/Kconfig @@ -0,0 +1,33 @@ +choice + prompt "choice" + +config A + bool "A" + +config B + bool "B" + +if B +choice + prompt "sub choice" + +config C + bool "C" + +config D + bool "D" + +if D +choice + prompt "subsub choice" + +config E + bool "E" + +endchoice +endif # D + +endchoice +endif # B + +endchoice diff --git a/scripts/kconfig/tests/rand_nested_choice/__init__.py b/scripts/kconfig/tests/rand_nested_choice/__init__.py new file mode 100644 index 0000000..9ceadf6 --- /dev/null +++ b/scripts/kconfig/tests/rand_nested_choice/__init__.py @@ -0,0 +1,16 @@ +""" +Set random values resursively in netsted choices. + +Kconfig can create a choice-in-choice structure by using 'if' statement. +randconfig should correctly set randome choice values. + +Related Linux commit: 3b9a19e08960e5cdad5253998637653e592a3c29 +""" + + +def test(conf): + for i in range(20): + assert conf.randconfig() == 0 + assert (conf.config_contains('expected_stdout0') or + conf.config_contains('expected_stdout1') or + conf.config_contains('expected_stdout2')) diff --git a/scripts/kconfig/tests/rand_nested_choice/expected_stdout0 b/scripts/kconfig/tests/rand_nested_choice/expected_stdout0 new file mode 100644 index 0000000..05450f3 --- /dev/null +++ b/scripts/kconfig/tests/rand_nested_choice/expected_stdout0 @@ -0,0 +1,2 @@ +CONFIG_A=y +# CONFIG_B is not set diff --git a/scripts/kconfig/tests/rand_nested_choice/expected_stdout1 b/scripts/kconfig/tests/rand_nested_choice/expected_stdout1 new file mode 100644 index 0000000..37ab295 --- /dev/null +++ b/scripts/kconfig/tests/rand_nested_choice/expected_stdout1 @@ -0,0 +1,4 @@ +# CONFIG_A is not set +CONFIG_B=y +CONFIG_C=y +# CONFIG_D is not set diff --git a/scripts/kconfig/tests/rand_nested_choice/expected_stdout2 b/scripts/kconfig/tests/rand_nested_choice/expected_stdout2 new file mode 100644 index 0000000..849ff47 --- /dev/null +++ b/scripts/kconfig/tests/rand_nested_choice/expected_stdout2 @@ -0,0 +1,5 @@ +# CONFIG_A is not set +CONFIG_B=y +# CONFIG_C is not set +CONFIG_D=y +CONFIG_E=y From patchwork Fri Mar 2 04:32:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130453 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp857248lja; Thu, 1 Mar 2018 20:34:15 -0800 (PST) X-Google-Smtp-Source: AG47ELsP3zDBhrbud2nrsapoyJeEMxVzXtfg96mT8EgkkZck0F6UyRScyxvXfeTq9XbIP9KpVb9G X-Received: by 10.98.34.75 with SMTP id i72mr4310883pfi.165.1519965255453; Thu, 01 Mar 2018 20:34:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965255; cv=none; d=google.com; s=arc-20160816; b=zoYyhsXmjKpqkRztUticy7J6j+iCxxQbngfXJlDIaqvVuS+7cvK4yauD2Wf3GKz09d wPvjWa4fNMSyopHMBOVgT/bM9c+TZ7MeNOmIHhIX36V255seJgrnrV0P86641SEYzLQ9 wMAoe8uCUC0QxEA4kxvaeYfqZv8NP1xeXpZteybX/ae/3WT4VqVpRnkFuWd0ErlyRFRD lTUZ96aWFKG0fqd6ishNYKxoJtO9hdi1a6LLBo+SfHyoR6zkqviAGaVw0+Wj5tCYUVGP 3zFPPEaTe1EDdlMCh6XpVDFRo9OfaTZFJcsWxnNqxsQm17hYy9YnwJacR05WT/4MKhiK +Qsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=vO+CONu9EvAUZfRJqDT+CIrQF6YVBUOKNPLNjHMlLtU=; b=lo8SKsPKmxeMLIkWkFMC5sdn0PuOBzREgHQ5M2pmn1aYJ6QEkEOyd46LILGJmy86+s TOaf40r2Ho7ZRw9EK9kLrQ560NXQAlkEVWUn/fI+nEysOpc0BAkLnQG7wmvqKeSBbmrc jjkyxtT4j41gkD4eLUrLTEYl6HperwdureMoifibXvxzbHmEe7KCtJ+sjLzcrOG3KuG6 ttOnG1OoNCiT9RvmL3Vy4ka23vedZWKCoac0ycdc99oYYu5mqx8/RjKnC/gJZuxtTiSb FA7DCmHYlwo5738W2/Xo2MWeY0a1xmzbvDczTxIKxTiP4XkmGCVEd5idvd6GLgQoHVkX J9TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=JEeVgNm0; 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 y186si2239833pfb.162.2018.03.01.20.34.15; Thu, 01 Mar 2018 20:34:15 -0800 (PST) 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=JEeVgNm0; 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 S1422681AbeCBEd5 (ORCPT + 28 others); Thu, 1 Mar 2018 23:33:57 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53155 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164986AbeCBEdr (ORCPT ); Thu, 1 Mar 2018 23:33:47 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURL022085; Fri, 2 Mar 2018 13:32:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURL022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965159; bh=vO+CONu9EvAUZfRJqDT+CIrQF6YVBUOKNPLNjHMlLtU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JEeVgNm0qFsYK2Y+Er1BHsUq6jTDo4OSxeWmiKwHoFHH/K58E9ln4Yzoe/OqwoRvO l6eZkD+Vqe/2TAfsgIJ6fBftOVxtCtdtD1uo9uPdC4QF9GSQVkYoko8ZpZUTf3YiDg GCw/7uXk6xf0GtyQs31b0PgH50mQjNG/Sr6OxBD/olYCa+P4jLMUIdUPnHvQAz+eyA wJePKavROdMtWpNno8F0kWirOx1CR6BUJKCjrbHAZ9Ekf64iS60WGXzl5Ve1hpLrSo cZhUIiPlFJOHVDbXYt7oRFE0PcgjxOLj5zWd71/VbK8yQ4CQN/gN4gEyqGMZjh3umf XKN6vOL5sz0Xg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 10/11] kconfig: unittest: test if recursive dependencies are detected Date: Fri, 2 Mar 2018 13:32:00 +0900 Message-Id: <1519965121-12017-11-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Recursive dependency should be detected and warned. Test this. (This indirectly tests the line number increments.) Signed-off-by: Masahiro Yamada Reviewed-by: Ulf Magnusson --- Changes in v2: - Fix missing end quote - coding style clean-up based on PEP8, PEP257 scripts/kconfig/tests/warn_recursive_dep/Kconfig | 62 ++++++++++++++++++++++ .../kconfig/tests/warn_recursive_dep/__init__.py | 9 ++++ .../tests/warn_recursive_dep/expected_stderr | 30 +++++++++++ 3 files changed, 101 insertions(+) create mode 100644 scripts/kconfig/tests/warn_recursive_dep/Kconfig create mode 100644 scripts/kconfig/tests/warn_recursive_dep/__init__.py create mode 100644 scripts/kconfig/tests/warn_recursive_dep/expected_stderr -- 2.7.4 diff --git a/scripts/kconfig/tests/warn_recursive_dep/Kconfig b/scripts/kconfig/tests/warn_recursive_dep/Kconfig new file mode 100644 index 0000000..a65bfcb --- /dev/null +++ b/scripts/kconfig/tests/warn_recursive_dep/Kconfig @@ -0,0 +1,62 @@ +# depends on itself + +config A + bool "A" + depends on A + +# select itself + +config B + bool + select B + +# depends on each other + +config C1 + bool "C1" + depends on C2 + +config C2 + bool "C2" + depends on C1 + +# depends on and select + +config D1 + bool "D1" + depends on D2 + select D2 + +config D2 + bool + +# depends on and imply +# This is not recursive dependency + +config E1 + bool "E1" + depends on E2 + imply E2 + +config E2 + bool "E2" + +# property + +config F1 + bool "F1" + default F2 + +config F2 + bool "F2" + depends on F1 + +# menu + +menu "menu depending on its content" + depends on G + +config G + bool "G" + +endmenu diff --git a/scripts/kconfig/tests/warn_recursive_dep/__init__.py b/scripts/kconfig/tests/warn_recursive_dep/__init__.py new file mode 100644 index 0000000..adb2195 --- /dev/null +++ b/scripts/kconfig/tests/warn_recursive_dep/__init__.py @@ -0,0 +1,9 @@ +""" +Warn recursive inclusion. + +Recursive dependency should be warned. +""" + +def test(conf): + assert conf.oldaskconfig() == 0 + assert conf.stderr_contains('expected_stderr') diff --git a/scripts/kconfig/tests/warn_recursive_dep/expected_stderr b/scripts/kconfig/tests/warn_recursive_dep/expected_stderr new file mode 100644 index 0000000..3de807d --- /dev/null +++ b/scripts/kconfig/tests/warn_recursive_dep/expected_stderr @@ -0,0 +1,30 @@ +Kconfig:9:error: recursive dependency detected! +Kconfig:9: symbol B is selected by B +For a resolution refer to Documentation/kbuild/kconfig-language.txt +subsection "Kconfig recursive dependency limitations" + +Kconfig:3:error: recursive dependency detected! +Kconfig:3: symbol A depends on A +For a resolution refer to Documentation/kbuild/kconfig-language.txt +subsection "Kconfig recursive dependency limitations" + +Kconfig:15:error: recursive dependency detected! +Kconfig:15: symbol C1 depends on C2 +Kconfig:19: symbol C2 depends on C1 +For a resolution refer to Documentation/kbuild/kconfig-language.txt +subsection "Kconfig recursive dependency limitations" + +Kconfig:30:error: recursive dependency detected! +Kconfig:30: symbol D2 is selected by D1 +Kconfig:25: symbol D1 depends on D2 +For a resolution refer to Documentation/kbuild/kconfig-language.txt +subsection "Kconfig recursive dependency limitations" + +Kconfig:59:error: recursive dependency detected! +Kconfig:59: symbol G depends on G +For a resolution refer to Documentation/kbuild/kconfig-language.txt +subsection "Kconfig recursive dependency limitations" + +Kconfig:50:error: recursive dependency detected! +Kconfig:50: symbol F2 depends on F1 +Kconfig:48: symbol F1 default value contains F2 From patchwork Fri Mar 2 04:32:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 130461 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp858649lja; Thu, 1 Mar 2018 20:36:31 -0800 (PST) X-Google-Smtp-Source: AG47ELsI9CX81+zI/lMkl25ddf1vrtRIZygaXGYCv0cShu/w1de/wRwqr70HWYgYrAkABG8YXCOu X-Received: by 10.99.0.207 with SMTP id 198mr3558420pga.364.1519965391682; Thu, 01 Mar 2018 20:36:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519965391; cv=none; d=google.com; s=arc-20160816; b=ESMtBsWD7cSHvR+F0Z8FI14kt6+Y0Lx2/xkwxFngEgQOdqGMw+nnOEq+hDP7UkPBGd oyNO9TmMZ1P4QXKLwtBz/Bq0RkWCC8MqprN1zJIX7uOZ6iARyQ55clMfZiqwDmTDzZwK EytIgk8htn1MWpD3Hl6uqWP5Qvje5yYXY1ujy8Q0gyOodW87NgThPFNgh38BntIG/oiH MWI6wZzlq5PCa1H3BGojjeVhBb3cQS0wG82rY2RF9QNaBnt19pob99Bq2xrdfFFDQtuy lz78fQ72Cs6EGHHft3OzIaDwZw4ppvkQ+Wt7XAQaCqkQZcVhCsgV+g9kX6vSFVlQVWol 5HHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=oNntiM8YDjzK8DDDlYwMBcd7P8ZgUmQckYBmYyraLDw=; b=X+FcM7Bp1/WCx/9I5XMWOhai7JBU6b4woSwU25FSGnr7gLxFul9YTz0ZWQsjfZqDRv KFhr775hFS1r53pix2NRLsuMD5FI8Gc95fCed7DzcSLnpGQ+uqX3d7yGyFHSw7yqv/Kn wtTnT5ef2yHm1T37xj3T1fAEuOKP06aWHA2ozG4/92U+u49MitIw3BaORd5eSwMUSdCs cWY3R5/u3BbtxxAPMMk5Sb4E/BLOtG0exG7lbogCvOtdrrtdJ7R+uf55qxFrHaEVkMA0 FMtsv4G6dYT3EpJ66Z+ei/t4ZNmJ68570MYQ3+hgB8X+pjkW4rPscPSWHGZGbyadTI+N aTIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=xXjcVt2e; 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 w16-v6si4077946plp.87.2018.03.01.20.36.31; Thu, 01 Mar 2018 20:36:31 -0800 (PST) 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=xXjcVt2e; 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 S1422784AbeCBEg1 (ORCPT + 28 others); Thu, 1 Mar 2018 23:36:27 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:53158 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164985AbeCBEdr (ORCPT ); Thu, 1 Mar 2018 23:33:47 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id w224WURM022085; Fri, 2 Mar 2018 13:32:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w224WURM022085 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1519965159; bh=oNntiM8YDjzK8DDDlYwMBcd7P8ZgUmQckYBmYyraLDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xXjcVt2eV4cmyAtH9TVATPbZ4LFNHw2q+hO5if3hP8KULs2wBaoRMHvBMcwVsiUPJ VNxeIJsQrgAi+nVxKxVh2R1T/TM26PLIK2gVUk0+mvum0UhriUCL1k7NSDE9AUwHuw CJElK4lpZ3Z8HCP1vZio+z9YmnWy4S5AGjRkm/zWE0lUsHSGXnuJCMUeffYvnEFgZS JHYuiL6KpRW8ZX1QDfbIARrPZgAfmJZ6PxJGEiZ/RsmIXr0T++36VMaBAeCA83Rkt4 ijV/Gtb1OnQ8S6vMzfrPHLiZpcPpWxC1kurb/NFXLvyutti2dqyxsU+1Ai+Y1ZfyUW o68nFcGRSzkTg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Michal Marek , Ulf Magnusson , Randy Dunlap , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 11/11] kconfig: unittest: test if recursive inclusion is detected Date: Fri, 2 Mar 2018 13:32:01 +0900 Message-Id: <1519965121-12017-12-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> References: <1519965121-12017-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If recursive inclusion is detected, it should fail with error messages. Test this. Signed-off-by: Masahiro Yamada Reviewed-by: Ulf Magnusson --- Changes in v2: - coding style clean-up based on PEP8, PEP257 scripts/kconfig/tests/err_recursive_inc/Kconfig | 1 + scripts/kconfig/tests/err_recursive_inc/Kconfig.inc | 1 + scripts/kconfig/tests/err_recursive_inc/__init__.py | 10 ++++++++++ scripts/kconfig/tests/err_recursive_inc/expected_stderr | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 scripts/kconfig/tests/err_recursive_inc/Kconfig create mode 100644 scripts/kconfig/tests/err_recursive_inc/Kconfig.inc create mode 100644 scripts/kconfig/tests/err_recursive_inc/__init__.py create mode 100644 scripts/kconfig/tests/err_recursive_inc/expected_stderr -- 2.7.4 diff --git a/scripts/kconfig/tests/err_recursive_inc/Kconfig b/scripts/kconfig/tests/err_recursive_inc/Kconfig new file mode 100644 index 0000000..3ce7a3f --- /dev/null +++ b/scripts/kconfig/tests/err_recursive_inc/Kconfig @@ -0,0 +1 @@ +source "Kconfig.inc" diff --git a/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc b/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc new file mode 100644 index 0000000..1fab1c1 --- /dev/null +++ b/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc @@ -0,0 +1 @@ +source "Kconfig" diff --git a/scripts/kconfig/tests/err_recursive_inc/__init__.py b/scripts/kconfig/tests/err_recursive_inc/__init__.py new file mode 100644 index 0000000..0e4c839 --- /dev/null +++ b/scripts/kconfig/tests/err_recursive_inc/__init__.py @@ -0,0 +1,10 @@ +""" +Detect recursive inclusion error. + +If recursive inclusion is detected, it should fail with error messages. +""" + + +def test(conf): + assert conf.oldaskconfig() != 0 + assert conf.stderr_contains('expected_stderr') diff --git a/scripts/kconfig/tests/err_recursive_inc/expected_stderr b/scripts/kconfig/tests/err_recursive_inc/expected_stderr new file mode 100644 index 0000000..b256c91 --- /dev/null +++ b/scripts/kconfig/tests/err_recursive_inc/expected_stderr @@ -0,0 +1,4 @@ +Kconfig:1: recursive inclusion detected. Inclusion path: + current file : 'Kconfig' + included from: 'Kconfig.inc:1' + included from: 'Kconfig:3'