feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Fix broken Unit Testing

Browse Source
This commit is contained in:
Ivan Kravets
2016-08-31 02:06:43 +03:00
parent 7a88778f5e
commit 1b32091d7d
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/__init__.py
View File

@ -14,7 +14,7 @@
import sys import sys
VERSION = (3, 0, "0b1") VERSION = (3, 0, "0b2")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

7
platformio/builder/main.py
View File

@ -18,8 +18,9 @@ from os import environ
from os.path import join from os.path import join
from time import time from time import time
from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, from SCons.Script import (ARGUMENTS, COMMAND_LINE_TARGETS, DEFAULT_TARGETS,
AllowSubstExceptions, DefaultEnvironment, Variables) AllowSubstExceptions, AlwaysBuild,
DefaultEnvironment, Variables)
from platformio import util from platformio import util
@ -127,6 +128,8 @@ env.SConscriptChdir(0)
env.SConsignFile(join("$PROJECTPIOENVS_DIR", ".sconsign.dblite")) env.SConsignFile(join("$PROJECTPIOENVS_DIR", ".sconsign.dblite"))
env.SConscript("$BUILD_SCRIPT") env.SConscript("$BUILD_SCRIPT")
AlwaysBuild(env.Alias("test", DEFAULT_TARGETS + ["size"]))
if "UPLOAD_FLAGS" in env: if "UPLOAD_FLAGS" in env:
env.Append(UPLOADERFLAGS=["$UPLOAD_FLAGS"]) env.Append(UPLOADERFLAGS=["$UPLOAD_FLAGS"])

4
platformio/commands/test.py
View File

@ -16,7 +16,7 @@
from fnmatch import fnmatch from fnmatch import fnmatch
from os import getcwd, listdir from os import getcwd, listdir
from os.path import isdir, join from os.path import isdir, isfile, join
from time import sleep, time from time import sleep, time
import click import click
@ -173,6 +173,8 @@ class LocalTestProcessor(TestProcessorBase):
def run(self): def run(self):
with util.cd(self.options['project_dir']): with util.cd(self.options['project_dir']):
pioenvs_dir = util.get_projectpioenvs_dir() pioenvs_dir = util.get_projectpioenvs_dir()
program_path = join(pioenvs_dir, self.env_name, "program")
assert isfile(program_path)
result = util.exec_command( result = util.exec_command(
[join(pioenvs_dir, self.env_name, "program")], [join(pioenvs_dir, self.env_name, "program")],
stdout=util.AsyncPipe(self.on_run_out), stdout=util.AsyncPipe(self.on_run_out),