ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:mbedmicro/mbed

pull/433/head
Bogdan Marinescu 2014-08-07 17:03:21 +01:00
parent 45597fd8e6 49a78419bb
commit 2cf5f34286
5 changed files with 90 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
workspace_tools/build_api.py
View File

@ -4,7 +4,6 @@ Copyright (c) 2011-2013 ARM Limited
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0

63
workspace_tools/build_travis.py
View File

@ -1,35 +1,54 @@
# Travis-CI build script #!/usr/bin/env python
"""
Travis-CI build script
mbed SDK
Copyright (c) 2011-2013 ARM Limited
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
"""
import os import os
import sys import sys
################################################################################ ################################################################################
# Configure builds here # Configure builds here
# "libs" can contain "dsp", "rtos", "eth", "usb_host", "usb", "ublox" # "libs" can contain "dsp", "rtos", "eth", "usb_host", "usb", "ublox", "fat"
build_list = ( build_list = (
{ "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "eth", "usb_host", "usb", "ublox"] }, { "target": "LPC1768", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "eth", "usb_host", "usb", "ublox", "fat"] },
{ "target": "LPC2368", "toolchains": "GCC_ARM" }, { "target": "LPC2368", "toolchains": "GCC_ARM", "libs": ["fat"] },
{ "target": "LPC11U24", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"]}, { "target": "LPC11U24", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "fat"] },
{ "target": "GHI_MBUINO", "toolchains": "GCC_ARM"}, { "target": "GHI_MBUINO", "toolchains": "GCC_ARM", "libs": ["fat"] },
{ "target": "LPC11U24_301", "toolchains": "GCC_ARM" },
{ "target": "NUCLEO_F103RB", "toolchains": "GCC_ARM"},
{ "target": "NUCLEO_F401RE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"]}, { "target": "LPC11U24_301", "toolchains": "GCC_ARM", "libs": ["fat"] },
{ "target": "LPC1114", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, { "target": "NUCLEO_F103RB", "toolchains": "GCC_ARM", "libs": ["fat"] },
{ "target": "LPC11U35_401", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] },
{ "target": "UBLOX_C027", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] },
{ "target": "LPC11U35_501", "toolchains": "GCC_ARM", "libs": ["dsp"] },
{ "target": "LPC11U68", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] },
{ "target": "KL05Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] }, { "target": "NUCLEO_F401RE", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "fat"] },
{ "target": "KL25Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, { "target": "LPC1114", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "fat"] },
{ "target": "KL46Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, { "target": "LPC11U35_401", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "fat"] },
{ "target": "K20D50M", "toolchains": "GCC_ARM", "libs": ["dsp"] }, { "target": "UBLOX_C027", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "fat"] },
{ "target": "K64F", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, { "target": "LPC11U35_501", "toolchains": "GCC_ARM", "libs": ["dsp", "fat"] },
{ "target": "LPC4088", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb"] }, { "target": "LPC11U68", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "fat"] },
{ "target": "ARCH_PRO", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos"] },
{ "target": "KL05Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "fat"] },
{ "target": "KL25Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb", "fat"] },
{ "target": "KL46Z", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb", "fat"] },
{ "target": "K20D50M", "toolchains": "GCC_ARM", "libs": ["dsp", "fat"] },
{ "target": "K64F", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb", "fat"] },
{ "target": "LPC4088", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "usb", "fat"] },
{ "target": "ARCH_PRO", "toolchains": "GCC_ARM", "libs": ["dsp", "rtos", "fat"] },
) )
################################################################################ ################################################################################

10
workspace_tools/singletest.py
View File

@ -106,6 +106,13 @@ if __name__ == '__main__':
(opts, args) = parser.parse_args() (opts, args) = parser.parse_args()
# Print scrip version
if opts.version:
print parser.description
print parser.epilog
print "Version %d.%d"% get_version()
exit(0)
# Print summary / information about automation test status # Print summary / information about automation test status
if opts.test_automation_report: if opts.test_automation_report:
print get_avail_tests_summary_table() print get_avail_tests_summary_table()
@ -176,7 +183,8 @@ if __name__ == '__main__':
_opts_only_build_tests=opts.only_build_tests, _opts_only_build_tests=opts.only_build_tests,
_opts_suppress_summary=opts.suppress_summary, _opts_suppress_summary=opts.suppress_summary,
_opts_test_x_toolchain_summary=opts.test_x_toolchain_summary, _opts_test_x_toolchain_summary=opts.test_x_toolchain_summary,
_opts_copy_method=opts.copy_method _opts_copy_method=opts.copy_method,
_opts_mut_reset_type=opts.mut_reset_type
) )
# Runs test suite in CLI mode # Runs test suite in CLI mode

47
workspace_tools/test_api.py
View File

@ -4,7 +4,6 @@ Copyright (c) 2011-2014 ARM Limited
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
@ -143,7 +142,9 @@ class SingleTestRunner(object):
_opts_only_build_tests=False, _opts_only_build_tests=False,
_opts_suppress_summary=False, _opts_suppress_summary=False,
_opts_test_x_toolchain_summary=False, _opts_test_x_toolchain_summary=False,
_opts_copy_method=None _opts_copy_method=None,
_opts_mut_reset_type=None,
_opts_jobs=None
): ):
""" Let's try hard to init this object """ """ Let's try hard to init this object """
PATTERN = "\\{(" + "|".join(self.TEST_RESULT_MAPPING.keys()) + ")\\}" PATTERN = "\\{(" + "|".join(self.TEST_RESULT_MAPPING.keys()) + ")\\}"
@ -182,6 +183,8 @@ class SingleTestRunner(object):
self.opts_suppress_summary = _opts_suppress_summary self.opts_suppress_summary = _opts_suppress_summary
self.opts_test_x_toolchain_summary = _opts_test_x_toolchain_summary self.opts_test_x_toolchain_summary = _opts_test_x_toolchain_summary
self.opts_copy_method = _opts_copy_method self.opts_copy_method = _opts_copy_method
self.opts_mut_reset_type = _opts_mut_reset_type
self.opts_jobs = _opts_jobs
def shuffle_random_func(self): def shuffle_random_func(self):
return self.shuffle_random_seed return self.shuffle_random_seed
@ -221,7 +224,8 @@ class SingleTestRunner(object):
build_mbed_libs_result = build_mbed_libs(T, build_mbed_libs_result = build_mbed_libs(T,
toolchain, toolchain,
options=build_mbed_libs_options, options=build_mbed_libs_options,
clean=clean_mbed_libs_options) clean=clean_mbed_libs_options,
jobs=self.opts_jobs)
if not build_mbed_libs_result: if not build_mbed_libs_result:
print 'Skipped tests for %s target. Toolchain %s is not yet supported for this target' % (T.name, toolchain) print 'Skipped tests for %s target. Toolchain %s is not yet supported for this target' % (T.name, toolchain)
continue continue
@ -274,7 +278,8 @@ class SingleTestRunner(object):
toolchain, toolchain,
options=build_project_options, options=build_project_options,
verbose=self.opts_verbose, verbose=self.opts_verbose,
clean=clean_mbed_libs_options) clean=clean_mbed_libs_options,
jobs=self.opts_jobs)
# TODO: move this 2 below loops to separate function # TODO: move this 2 below loops to separate function
INC_DIRS = [] INC_DIRS = []
@ -298,7 +303,8 @@ class SingleTestRunner(object):
verbose=self.opts_verbose, verbose=self.opts_verbose,
name=project_name, name=project_name,
macros=MACROS, macros=MACROS,
inc_dirs=INC_DIRS) inc_dirs=INC_DIRS,
jobs=self.opts_jobs)
if self.opts_only_build_tests: if self.opts_only_build_tests:
# With this option we are skipping testing phase # With this option we are skipping testing phase
@ -546,7 +552,8 @@ class SingleTestRunner(object):
start_host_exec_time = time() start_host_exec_time = time()
host_test_verbose = self.opts_verbose_test_result_only or self.opts_verbose host_test_verbose = self.opts_verbose_test_result_only or self.opts_verbose
single_test_result = self.run_host_test(test.host_test, disk, port, duration, host_test_verbose) host_test_reset = self.opts_mut_reset_type
single_test_result = self.run_host_test(test.host_test, disk, port, duration, verbose=host_test_verbose, reset=host_test_reset)
# Store test result # Store test result
test_all_result.append(single_test_result) test_all_result.append(single_test_result)
@ -585,12 +592,19 @@ class SingleTestRunner(object):
result = test_all_result[0] result = test_all_result[0]
return result return result
def run_host_test(self, name, disk, port, duration, verbose=False, extra_serial=""): def run_host_test(self, name, disk, port, duration, reset=None, verbose=False, extra_serial=None):
""" Function creates new process with host test configured with particular test case. """ Function creates new process with host test configured with particular test case.
Function also is pooling for serial port activity from process to catch all data Function also is pooling for serial port activity from process to catch all data
printed by test runner and host test during test execution.""" printed by test runner and host test during test execution."""
# print "{%s} port:%s disk:%s" % (name, port, disk), # print "{%s} port:%s disk:%s" % (name, port, disk),
cmd = ["python", "%s.py" % name, '-p', port, '-d', disk, '-t', str(duration), "-e", extra_serial] cmd = ["python", "%s.py" % name, '-p', port, '-d', disk, '-t', str(duration)]
# Add extra parameters to host_test
if extra_serial is not None:
cmd += ["-e", extra_serial]
if reset is not None:
cmd += ["-r", reset]
proc = Popen(cmd, stdout=PIPE, cwd=HOST_TESTS) proc = Popen(cmd, stdout=PIPE, cwd=HOST_TESTS)
obs = ProcessObserver(proc) obs = ProcessObserver(proc)
start_time = time() start_time = time()
@ -958,6 +972,12 @@ def get_default_test_options_parser():
metavar="FILE", metavar="FILE",
help='Points to file with MUTs specification (overwrites settings.py and private_settings.py)') help='Points to file with MUTs specification (overwrites settings.py and private_settings.py)')
parser.add_option("-j", "--jobs",
dest='jobs',
metavar="NUMBER",
type="int",
help="Define number of compilation jobs. Default value is 1")
parser.add_option('-g', '--goanna-for-tests', parser.add_option('-g', '--goanna-for-tests',
dest='goanna_for_tests', dest='goanna_for_tests',
metavar=False, metavar=False,
@ -1055,6 +1075,11 @@ def get_default_test_options_parser():
default=None, default=None,
help='Shuffle seed (If you want to reproduce your shuffle order please use seed provided in test summary)') help='Shuffle seed (If you want to reproduce your shuffle order please use seed provided in test summary)')
parser.add_option('', '--reset-type',
dest='mut_reset_type',
default=None,
help='Extra reset method used to reset MUT by host test script')
parser.add_option('-f', '--filter', parser.add_option('-f', '--filter',
dest='general_filter_regex', dest='general_filter_regex',
default=None, default=None,
@ -1077,4 +1102,10 @@ def get_default_test_options_parser():
default=False, default=False,
action="store_true", action="store_true",
help='Verbose mode (prints some extra information)') help='Verbose mode (prints some extra information)')
parser.add_option('', '--version',
dest='version',
default=False,
action="store_true",
help='Prints script version and exits')
return parser return parser

2
workspace_tools/tests.py
View File

@ -244,7 +244,7 @@ TESTS = [
"dependencies": [MBED_LIBRARIES, TEST_MBED_LIB], "dependencies": [MBED_LIBRARIES, TEST_MBED_LIB],
"peripherals": ["24LC256"], "peripherals": ["24LC256"],
"automated": True, "automated": True,
"duration": 15, "duration": 10,
}, },
{ {
"id": "MBED_BLINKY", "description": "Blinky", "id": "MBED_BLINKY", "description": "Blinky",