Skip to content

Commit

Permalink
kconfig: tests: fix recursive inclusion unit test
Browse files Browse the repository at this point in the history
Adding SPDX license identifier is pretty safe; however, here is one
exception.

Since commit ec8f24b ("treewide: Add SPDX license identifier -
Makefile/Kconfig"), "make testconfig" would not pass.

When Kconfig detects a circular file inclusion, it displays error
messages with a file name and a line number prefixed to each line.

The unit test checks if Kconfig emits the error messages correctly
(this also checks the line number correctness).

Now that the test input has the SPDX license identifier at the very top,
the line numbers in the expected stderr should be incremented by 1.

Fixes: ec8f24b ("treewide: Add SPDX license identifier - Makefile/Kconfig")
Signed-off-by: Masahiro Yamada <[email protected]>
  • Loading branch information
masahir0y committed Jun 4, 2019
1 parent 6d3db46 commit 8dde571
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions scripts/kconfig/tests/err_recursive_inc/expected_stderr
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Recursive inclusion detected.
Inclusion path:
current file : Kconfig.inc1
included from: Kconfig.inc3:1
included from: Kconfig.inc2:3
included from: Kconfig.inc1:4
included from: Kconfig.inc3:2
included from: Kconfig.inc2:4
included from: Kconfig.inc1:5

0 comments on commit 8dde571

Please sign in to comment.