|
18 | 18 | from os import getenv
|
19 | 19 |
|
20 | 20 | # Conventions about the directory structure
|
21 |
| -from settings import ROOT, BUILD_DIR |
| 21 | +from tools.settings import ROOT, BUILD_DIR |
22 | 22 |
|
23 | 23 | # Allow overriding some of the build parameters using environment variables
|
24 | 24 | BUILD_DIR = getenv("MBED_BUILD_DIR") or BUILD_DIR
|
|
104 | 104 | CPPUTEST_INC = join(CPPUTEST_DIR, "cpputest", "include")
|
105 | 105 | CPPUTEST_INC_EXT = join(CPPUTEST_DIR, "cpputest", "include", "CppUTest")
|
106 | 106 | # Platform dependant code is here (for armcc compiler)
|
107 |
| -CPPUTEST_PLATFORM_SRC = join(CPPUTEST_DIR, "cpputest", "src", "Platforms", "armcc") |
108 |
| -CPPUTEST_PLATFORM_INC = join(CPPUTEST_DIR, "cpputest", "include", "Platforms", "armcc") |
| 107 | +CPPUTEST_PLATFORM_SRC = join(CPPUTEST_DIR, "cpputest", "src", "Platforms", |
| 108 | + "armcc") |
| 109 | +CPPUTEST_PLATFORM_INC = join(CPPUTEST_DIR, "cpputest", "include", "Platforms", |
| 110 | + "armcc") |
109 | 111 | # Function 'main' used to run all compiled UTs
|
110 | 112 | CPPUTEST_TESTRUNNER_SCR = join(TEST_DIR, "utest", "testrunner")
|
111 | 113 | CPPUTEST_TESTRUNNER_INC = join(TEST_DIR, "utest", "testrunner")
|
|
0 commit comments