Merge pull request #311 from bridadan/adding-build-options-to-test

Adding -o option to 'mbed test'

Author: screamerbg

README.md

@@ -482,7 +482,8 @@ The arguments to `test` are:
 * `--run` to only run the tests. For example, `$ mbed test -m K64F -t GCC_ARM --run`.
 * `-n <TESTS_BY_NAME>` to limit the tests built or run to those listed (by name) in a comma separated list. For example, `$ mbed test -m K64F -t GCC_ARM -n TESTS-functional-test1,TESTS-functional-test2`.
 * `--source <SOURCE>` to select the source directory. The default is `.` (the current directory). You can specify multiple source locations, even outside the program tree.
-* `--build <BUILD>` to select the build directory. Default: `.build/ inside your program.
+* `--build <BUILD>` to select the build directory. Default: `.build/` inside your program.
+* `--options <OPTIONS>` to select compile options. Examples: "debug-info": will generate debugging information; "small-build" will use microlib/nanolib, but limit RTOS to single thread; "save-asm": will save the asm generated by the compiler
 * `-c or --clean` to clean the build directory before compiling,
 * `--test-spec <TEST_SPEC>` to set the path for the test spec file used when building and running tests (the default path is the build directory).
 * `-v` or `--verbose` for verbose diagnostic output.

mbed/mbed.py

@@ -2018,11 +2018,12 @@ def compile_(toolchain=None, mcu=None, source=False, build=False, compile_librar
     dict(name=['-n', '--tests-by-name'], dest='tests_by_name', help='Limit the tests to a list (ex. test1,test2,test3)'),
     dict(name='--source', action='append', help='Source directory. Default: . (current dir)'),
     dict(name='--build', help='Build directory. Default: .build/'),
+    dict(name=['-o', '--options'], action='append', help='Compile options. Examples: "debug-info": generate debugging information; "small-build" to use microlib/nanolib, but limit RTOS to single thread; "save-asm": save the asm generated by the compiler'),
     dict(name=['-c', '--clean'], action='store_true', help='Clean the build directory before compiling'),
     dict(name='--test-spec', dest="test_spec", help="Path used for the test spec file used when building and running tests (the default path is the build directory)"),
     help='Find, build and run tests',
     description=("Find, build, and run tests in a program and libraries"))
-def test_(toolchain=None, mcu=None, compile_list=False, run_list=False, compile_only=False, run_only=False, tests_by_name=None, source=False, build=False, clean=False, test_spec=None):
+def test_(toolchain=None, mcu=None, compile_list=False, run_list=False, compile_only=False, run_only=False, tests_by_name=None, source=False, options=False, build=False, clean=False, test_spec=None):
     # Gather remaining arguments
     args = remainder
     # Find the root of the program
@@ -2058,7 +2059,9 @@ def test_(toolchain=None, mcu=None, compile_list=False, run_list=False, compile_
 
         if compile_list:
             popen(['python', '-u', os.path.join(tools_dir, 'test.py'), '--list']
+                  + list(chain.from_iterable(izip(repeat('-o'), options or [])))
                   + ['-t', tchain, '-m', target]
+                  + list(chain.from_iterable(izip(repeat('--source'), source)))
                   + (['-n', tests_by_name] if tests_by_name else [])
                   + (['-v'] if verbose else [])
                   + args,
@@ -2067,6 +2070,7 @@ def test_(toolchain=None, mcu=None, compile_list=False, run_list=False, compile_
         if compile_only or build_and_run_tests:
             popen(['python', '-u', os.path.join(tools_dir, 'test.py')]
                   + list(chain.from_iterable(izip(repeat('-D'), macros)))
+                  + list(chain.from_iterable(izip(repeat('-o'), options or [])))
                   + ['-t', tchain, '-m', target]
                   + (['-c'] if clean else [])
                   + list(chain.from_iterable(izip(repeat('--source'), source)))