From df97bcaea2d6c24ddd62c4e9685d0db54aade092 Mon Sep 17 00:00:00 2001
From: Ulf Magnusson <ulfalizer@gmail.com>
Date: Sat, 18 Aug 2018 01:07:23 +0200
Subject: Revert "Fix $srctree logic for the top-level Kconfig file"

This reverts commit 8a3999bc708e8468ff79665e3cbdfccd603160e1.

I realized that this should go in a major release at least, because it
has the potential to break scripts that rely on the old behavior of
ignoring $srctree for the filename passed to Kconfig.__init__().

A dummy release will bump the version to 9.4.2. Any future release with
the change will be 10.0.0.
---
 testsuite.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'testsuite.py')

diff --git a/testsuite.py b/testsuite.py
index cddce68..a521128 100644
--- a/testsuite.py
+++ b/testsuite.py
@@ -895,17 +895,17 @@ comment "advanced comment"
 <configuration with 14 symbols, main menu prompt "Main menu", srctree is current directory, config symbol prefix "CONFIG_", warnings disabled, printing of warnings to stderr enabled, undef. symbol assignment warnings disabled, redundant symbol assignment warnings enabled>
 """)
 
-    os.environ["srctree"] = "Kconfiglib"
+    os.environ["srctree"] = "srctree value"
     os.environ["CONFIG_"] = "CONFIG_ value"
 
-    c = Kconfig("tests/Krepr", warn=False)
+    c = Kconfig("Kconfiglib/tests/Krepr", warn=False)
     c.enable_warnings()
     c.disable_stderr_warnings()
     c.disable_redun_warnings()
     c.enable_undef_warnings()
 
     verify_repr(c, """
-<configuration with 14 symbols, main menu prompt "Main menu", srctree "Kconfiglib", config symbol prefix "CONFIG_ value", warnings enabled, printing of warnings to stderr disabled, undef. symbol assignment warnings enabled, redundant symbol assignment warnings disabled>
+<configuration with 14 symbols, main menu prompt "Main menu", srctree "srctree value", config symbol prefix "CONFIG_ value", warnings enabled, printing of warnings to stderr disabled, undef. symbol assignment warnings enabled, redundant symbol assignment warnings disabled>
 """)
 
     os.environ.pop("srctree", None)
@@ -987,7 +987,7 @@ g
         os.environ["srctree"] = srctree
 
         # Has symbol with empty help text, so disable warnings
-        c = Kconfig("tests/Klocation", warn=False)
+        c = Kconfig("Kconfiglib/tests/Klocation", warn=False)
 
         verify_locations(c.syms["SINGLE_DEF"].nodes, "tests/Klocation:4")
 
@@ -1018,7 +1018,7 @@ g
         # Test recursive 'source' detection
 
         try:
-            Kconfig("tests/Krecursive1")
+            Kconfig("Kconfiglib/tests/Krecursive1")
         except KconfigError:
             pass
         except:
@@ -1030,7 +1030,7 @@ g
         # TODO: Make an exception test helper
 
         try:
-            Kconfig("tests/Kmissingsource")
+            Kconfig("Kconfiglib/tests/Kmissingsource")
         except KconfigError:
             pass
         except:
@@ -1039,7 +1039,7 @@ g
             fail("'source' with missing file did not raise exception")
 
         try:
-            Kconfig("tests/Kmissingrsource")
+            Kconfig("Kconfiglib/tests/Kmissingrsource")
         except KconfigError:
             pass
         except:
@@ -1559,7 +1559,7 @@ g
            "defconfig_filename gave wrong file with $srctree unset")
 
     os.environ["srctree"] = "Kconfiglib/tests"
-    c = Kconfig("Kdefconfig_srctree")
+    c = Kconfig("Kconfiglib/tests/Kdefconfig_srctree")
     verify(c.defconfig_filename == "Kconfiglib/tests/sub/defconfig_in_sub",
            "defconfig_filename gave wrong file with $srctree set")
 
-- 
cgit v1.2.3