Skip to content

Relative paths in test spec file #2076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2016
Merged

Relative paths in test spec file #2076

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions tools/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,6 +2008,15 @@ def print_tests(tests, format="list", sort=True):
print "Unknown format '%s'" % format
sys.exit(1)

def norm_relative_path(path, start):
"""This function will create a normalized, relative path. It mimics the
python os.path.relpath function, but also normalizes a Windows-syle path
that use backslashes to a Unix style path that uses forward slashes."""
path = os.path.normpath(path)
path = os.path.relpath(path, start)
path = path.replace("\\", "/")
return path

def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
options=None, clean=False, notify=None, verbose=False, jobs=1,
macros=None, silent=False, report=None, properties=None,
Expand All @@ -2018,10 +2027,14 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
Returns a tuple of the build result (True or False) followed by the test
build data structure"""

execution_directory = "."

base_path = norm_relative_path(build_path, execution_directory)

test_build = {
"platform": target.name,
"toolchain": toolchain_name,
"base_path": build_path,
"base_path": base_path,
"baud_rate": 9600,
"binary_type": "bootable",
"tests": {}
Expand Down Expand Up @@ -2060,7 +2073,7 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,

# Normalize the path
if bin_file:
bin_file = os.path.normpath(bin_file)
bin_file = norm_relative_path(bin_file, execution_directory)

test_build['tests'][test_name] = {
"binaries": [
Expand Down