platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-29 17:47:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/v3.5.5' into develop

Browse Source 
* hotfix/v3.5.5:
  Fix PIO Unit Testing issue when ``UNIT_TEST`` macro was not set in a build environment
  Append __PLATFORMIO_DEBUG__ macro in debug session
  Add udev rules for J-Link devices
  Disable exec command for Sublime Text debugger

# Conflicts:
#	HISTORY.rst
This commit is contained in:
Ivan Kravets
2018-07-19 15:28:58 +03:00
parent 2ba41cddc4 ff3ce2d69e
commit aa796959c9
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
HISTORY.rst
View File

@ -22,6 +22,13 @@ PlatformIO 3.0
install/uninstall operations
(`issue #1594 <https://github.com/platformio/platformio-core/issues/1594>`_)
3.5.5 (2018-??-??)
~~~~~~~~~~~~~~~~~~
* Fixed `PIO Unit Testing <http://docs.platformio.org/page/plus/unit-testing.html>`__
issue with a shared code between main and test programs when ``UNIT_TEST``
macro was not set in a build environment
3.5.4 (2018-07-03)
~~~~~~~~~~~~~~~~~~

2
docs

Submodule docs updated: 4c1af2805e...a77ecd1295

19
platformio/builder/tools/platformio.py
View File

@ -54,21 +54,20 @@ def _build_project_deps(env):
if project_lib_builder.env.get(key)
})
if "__test" in COMMAND_LINE_TARGETS:
env.ProcessTest()
projenv = env.Clone()
projenv.BuildSources("$BUILDTEST_DIR", "$PROJECTTEST_DIR",
"$PIOTEST_SRC_FILTER")
else:
projenv = env.Clone()
projenv.BuildSources("$BUILDSRC_DIR", "$PROJECTSRC_DIR",
env.get("SRC_FILTER"))
projenv = env.Clone()
# CPPPATH from dependencies
projenv.PrependUnique(CPPPATH=project_lib_builder.env.get("CPPPATH"))
# extra build flags from `platformio.ini`
projenv.ProcessFlags(env.get("SRC_BUILD_FLAGS"))
if "__test" in COMMAND_LINE_TARGETS:
projenv.BuildSources("$BUILDTEST_DIR", "$PROJECTTEST_DIR",
"$PIOTEST_SRC_FILTER")
else:
projenv.BuildSources("$BUILDSRC_DIR", "$PROJECTSRC_DIR",
env.get("SRC_FILTER"))
if not env.get("PIOBUILDFILES") and not COMMAND_LINE_TARGETS:
sys.stderr.write(
"Error: Nothing to build. Please put your source code files "
@ -95,6 +94,8 @@ def BuildProgram(env):
if "__debug" in COMMAND_LINE_TARGETS:
env.ProcessDebug()
if "__test" in COMMAND_LINE_TARGETS:
env.ProcessTest()
# process extra flags from board
if "BOARD" in env and "build.extra_flags" in env.BoardConfig():