Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1575595 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: error out when seeing recursive dependency 



Originally, recursive dependency was a fatal error for Kconfig
because Kconfig cannot compute symbol values in such a situation.

Commit d595cea6 ("kconfig: print more info when we see a recursive
dependency") changed it to a warning, which I guess was not intentional.

Get it back to an error again.

Also, rename the unit test directory "warn_recursive_dep" to
"err_recursive_dep" so that it matches to the behavior.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: default avatarDirk Gouders <dirk@gouders.net>
parent 4bf6a9af

scripts/kconfig/symbol.c

+0 −3
Original line number Diff line number Diff line
@@ -1248,9 +1248,6 @@ struct symbol *sym_check_deps(struct symbol *sym) 
		sym->flags &= ~SYMBOL_CHECK;

	}



	if (sym2 && sym2 == sym)

		sym2 = NULL;



	return sym2;

}

scripts/kconfig/tests/warn_recursive_dep/__init__.py→scripts/kconfig/tests/err_recursive_dep/__init__.py

+10 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

"""

Warn recursive inclusion.

Detect recursive dependency error.



Recursive dependency should be warned.

Recursive dependency should be treated as an error.

"""



def test(conf):

    assert conf.oldaskconfig() == 0

    assert conf.oldaskconfig() == 1

    assert conf.stderr_contains('expected_stderr')