From d02f02731f0868b18d02149a781eeba95d90646a Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 29 Apr 2022 20:44:28 +0300
Subject: [PATCH] Rename the "test_build_project_src" project configuration
 option to "test_build_src"

---
 HISTORY.rst                            | 1 +
 platformio/builder/tools/platformio.py | 4 +---
 platformio/project/options.py          | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 34b0e762..8109014e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -49,6 +49,7 @@ Please check `Migration guide from 5.x to 6.0 <https://docs.platformio.org/en/la
   - Generate reports in JUnit and JSON formats using the `pio test --output-format <https://docs.platformio.org/en/latest/core/userguide/cmd_test.html#cmdoption-pio-test-output-format>`__ option  (`issue #2891 <https://github.com/platformio/platformio-core/issues/2891>`_)
   - Provide more information when the native program crashed on a host (errored with a negative return code) (`issue #3429 <https://github.com/platformio/platformio-core/issues/3429>`_)
   - Fixed an issue when command line parameters ("--ignore", "--filter") do not override values defined in the |PIOCONF| (`issue #3845 <https://github.com/platformio/platformio-core/issues/3845>`_)
+  - Renamed the "test_build_project_src" project configuration option to `test_build_src <https://docs.platformio.org/en/latest//projectconf/section_env_test.html#test-build-src>`__
 
 * **Static Code Analysis**
 
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 2198ca22..fde67426 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -166,9 +166,7 @@ def ProcessProjectDeps(env):
         projenv.BuildSources(
             "$BUILD_TEST_DIR", "$PROJECT_TEST_DIR", "$PIOTEST_SRC_FILTER"
         )
-    if "test" not in env.GetBuildType() or env.GetProjectOption(
-        "test_build_project_src"
-    ):
+    if "test" not in env.GetBuildType() or env.GetProjectOption("test_build_src"):
         projenv.BuildSources(
             "$BUILD_SRC_DIR", "$PROJECT_SRC_DIR", env.get("SRC_FILTER")
         )
diff --git a/platformio/project/options.py b/platformio/project/options.py
index ef470801..a82e5459 100644
--- a/platformio/project/options.py
+++ b/platformio/project/options.py
@@ -679,8 +679,9 @@ ProjectOptions = OrderedDict(
             ),
             ConfigEnvOption(
                 group="test",
-                name="test_build_project_src",
-                description="Build project source code in a pair with test code",
+                name="test_build_src",
+                oldnames=["test_build_project_src"],
+                description="Build main source code in pair with a test code",
                 type=click.BOOL,
                 default=False,
             ),