From b624eda4e5bc66d067d7ce4c87c54f0b5df02acf Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Fri, 7 Nov 2014 09:16:48 +0000 Subject: [PATCH 1/2] Tools: Cpputest - fix for testrunner to be exported with predefined cpputests --- workspace_tools/tests.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/workspace_tools/tests.py b/workspace_tools/tests.py index 33eb764339..4c1c20c189 100644 --- a/workspace_tools/tests.py +++ b/workspace_tools/tests.py @@ -20,6 +20,8 @@ from workspace_tools.data.support import * TEST_CMSIS_LIB = join(TEST_DIR, "cmsis", "lib") TEST_MBED_LIB = join(TEST_DIR, "mbed", "env") +TEST_MBED_TESTRUNNER_LIB = join(TEST_DIR, "utest", "testrunner") + PERIPHERALS = join(TEST_DIR, "peripherals") BENCHMARKS_DIR = join(TEST_DIR, "benchmarks") @@ -883,20 +885,20 @@ TESTS = [ { "id": "UT_1", "description": "Basic", "source_dir": join(TEST_DIR, "utest", "basic"), - "dependencies": [MBED_LIBRARIES, TEST_MBED_LIB, CPPUTEST_LIBRARY], + "dependencies": [MBED_LIBRARIES, TEST_MBED_LIB, CPPUTEST_LIBRARY, TEST_MBED_TESTRUNNER_LIB], "automated": False, }, { "id": "UT_2", "description": "Semihost file system", "source_dir": join(TEST_DIR, "utest", "semihost_fs"), - "dependencies": [MBED_LIBRARIES, TEST_MBED_LIB, CPPUTEST_LIBRARY], + "dependencies": [MBED_LIBRARIES, TEST_MBED_LIB, CPPUTEST_LIBRARY, TEST_MBED_TESTRUNNER_LIB], "automated": False, "mcu": ["LPC1768", "LPC2368", "LPC11U24"] }, { "id": "UT_3", "description": "General tests", "source_dir": join(TEST_DIR, "utest", "general"), - "dependencies": [MBED_LIBRARIES, TEST_MBED_LIB, CPPUTEST_LIBRARY], + "dependencies": [MBED_LIBRARIES, TEST_MBED_LIB, CPPUTEST_LIBRARY, TEST_MBED_TESTRUNNER_LIB], "automated": False, }, From 1c268fb25b4e045c3c969f439ef239ad3c0a47a2 Mon Sep 17 00:00:00 2001 From: 0xc0170 Date: Fri, 7 Nov 2014 10:24:57 +0000 Subject: [PATCH 2/2] Tests: Testrunner - console variable name fix It matches the cpputest from mbed mbed.org repository. --- libraries/tests/utest/testrunner/testrunner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tests/utest/testrunner/testrunner.cpp b/libraries/tests/utest/testrunner/testrunner.cpp index a5a614157a..6ffe204f79 100644 --- a/libraries/tests/utest/testrunner/testrunner.cpp +++ b/libraries/tests/utest/testrunner/testrunner.cpp @@ -5,10 +5,10 @@ #include "test_env.h" /** -Object 'mbed_cpputest_console' is used to show prints on console. +Object 'console' is used to show prints on console. It is declared in \cpputest\src\Platforms\armcc\UtestPlatform.cpp */ -Serial mbed_cpputest_console(STDIO_UART_TX, STDIO_UART_RX); +Serial console(STDIO_UART_TX, STDIO_UART_RX); int main(int ac, char** av) {