diff --git a/dist/tools/kconfiglib/genconfig.py b/dist/tools/kconfiglib/genconfig.py index 2fa52f51b3..539adda18a 100755 --- a/dist/tools/kconfiglib/genconfig.py +++ b/dist/tools/kconfiglib/genconfig.py @@ -245,16 +245,9 @@ def check_configs(kconf): - A configuration parameter could not be set to value defined by the user. """ - test_kconfig = os.getenv("TEST_KCONFIG") - - if (test_kconfig): - app_check = check_application_symbol(kconf) - else: - app_check = True - sym_check = check_config_symbols(kconf) choice_check = check_config_choices(kconf) - return app_check and sym_check and choice_check + return sym_check and choice_check def get_sym_missing_deps(sym): diff --git a/dist/tools/kconfiglib/tests/test.sh b/dist/tools/kconfiglib/tests/test.sh index 6b38eabd49..a404bf69e5 100755 --- a/dist/tools/kconfiglib/tests/test.sh +++ b/dist/tools/kconfiglib/tests/test.sh @@ -18,8 +18,6 @@ KCONFIGLIB_DIR="$(readlink -f "$(dirname "$0")/..")" TESTS_DIR=${KCONFIGLIB_DIR}/tests GENCONFIG=${KCONFIGLIB_DIR}/genconfig.py -export TEST_KCONFIG=1 - KCONFIG_FILE="${TESTS_DIR}/Kconfig.test" CONFIG_FOO_Y="${TESTS_DIR}/foo_y.config" CONFIG_BAR_Y="${TESTS_DIR}/bar_y.config" @@ -93,19 +91,6 @@ function check_files_exist { fi } -# TEST -# verifies that when the APPLICATION symbol is present, the script fails when -# its value is not 'y' because of missing dependencies (e.g. missing features). -function application_missing_deps_should_fail { - if OUT=$(${GENCONFIG} --kconfig-filename "${KCONFIG_FILE}" 2>&1) - then - 1>&2 echo -n "$OUT" - return 1 - else - return 0 - fi -} - # TEST # verifies that when the dependencies for the APPLICATION symbol are present # the symbol gets the 'y' value and the script succeeds. @@ -178,7 +163,6 @@ function choice_with_deps_should_succeed { } run_test check_files_exist -run_test application_missing_deps_should_fail run_test application_with_deps_should_succeed run_test missing_module_should_fail run_test module_with_deps_should_succeed