@micro-os-plus/micro-test-plus 3.1.0 → 3.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +23 -1
- package/README.md +13 -8
- package/package.json +64 -421
- package/src/test-runner.cpp +6 -2
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,28 @@ Please check
|
|
|
6
6
|
[GitHub](https://github.com/micro-os-plus/micro-test-plus-xpack/issues/)
|
|
7
7
|
and close existing issues and pull requests.
|
|
8
8
|
|
|
9
|
+
## 2022-07-30
|
|
10
|
+
|
|
11
|
+
* v3.1.1
|
|
12
|
+
* 41d0acf update mps2 config
|
|
13
|
+
* 7c4cf61 #7: package.json: use inheritance
|
|
14
|
+
* 736a885 bump deps
|
|
15
|
+
* 6221d1f #6: remove STM32F4DISCOVERY test
|
|
16
|
+
* b080101 test-runner.cpp: conditional verbosity
|
|
17
|
+
|
|
18
|
+
## 2022-07-28
|
|
19
|
+
|
|
20
|
+
* ec67074 CI.yml do not trigger on tags
|
|
21
|
+
|
|
22
|
+
## 2022-07-25
|
|
23
|
+
|
|
24
|
+
* af5ae81 package.json minimumXpmRequired
|
|
25
|
+
|
|
26
|
+
## 2022-07-12
|
|
27
|
+
|
|
28
|
+
* 2b15c56 CMake: xpack_display_greetings() with arg
|
|
29
|
+
* 4459cc9 package.json: bump deps
|
|
30
|
+
|
|
9
31
|
## 2022-06-04
|
|
10
32
|
|
|
11
33
|
* v3.1.0
|
|
@@ -338,7 +360,7 @@ and close existing issues and pull requests.
|
|
|
338
360
|
* 6f55a37 package.json: rename dependencies to device-*
|
|
339
361
|
* fde47e6 package.json: move toolchain files to folder
|
|
340
362
|
* 041c252 cmake: rename platform-qemu-mps2-an386
|
|
341
|
-
* 1230c9b cmake: update for
|
|
363
|
+
* 1230c9b cmake: update for devices-qemu-cortexm
|
|
342
364
|
* 10304ab rename platform-qemu-mps2-an386
|
|
343
365
|
|
|
344
366
|
## 2022-01-28
|
package/README.md
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
[](https://github.com/micro-os-plus/micro-test-plus-xpack/blob/xpack/LICENSE)
|
|
2
|
-
[](https://github.com/micro-os-plus/micro-test-plus-xpack/actions/workflows/CI.yml)
|
|
3
3
|
|
|
4
4
|
# A source library xPack with µTest++, a lightweight testing framework for embedded platforms
|
|
5
5
|
|
|
@@ -20,7 +20,7 @@ For maintainer info, please see the
|
|
|
20
20
|
|
|
21
21
|
## Install
|
|
22
22
|
|
|
23
|
-
As a source library
|
|
23
|
+
As a source library xPack, the easiest way to add it to a project is via
|
|
24
24
|
**xpm**, but it can also be used as any Git project, for example as a submodule.
|
|
25
25
|
|
|
26
26
|
### Prerequisites
|
|
@@ -33,7 +33,7 @@ For details please follow the instructions in the
|
|
|
33
33
|
|
|
34
34
|
### xpm
|
|
35
35
|
|
|
36
|
-
This package is available as
|
|
36
|
+
This package is available from npmjs.com as
|
|
37
37
|
[`@micro-os-plus/micro-test-plus`](https://www.npmjs.com/package/@micro-os-plus/micro-test-plus)
|
|
38
38
|
from the `npmjs.com` registry:
|
|
39
39
|
|
|
@@ -960,6 +960,11 @@ Also, please note that the memory footprint on `debug` (built with `-O0`),
|
|
|
960
960
|
is significantly larger than on `release`. If necessary, the optimization
|
|
961
961
|
for the `debug` build can be increased to `-Og`, to save some memory.
|
|
962
962
|
|
|
963
|
+
### Status
|
|
964
|
+
|
|
965
|
+
The **µTest++** source library is fully functional and is used to test the
|
|
966
|
+
µOS++ packages.
|
|
967
|
+
|
|
963
968
|
### Build & integration info
|
|
964
969
|
|
|
965
970
|
The project is written in C++, and the tests are expected to be
|
|
@@ -991,7 +996,7 @@ The header files to be included in user projects are:
|
|
|
991
996
|
|
|
992
997
|
#### Source files
|
|
993
998
|
|
|
994
|
-
The source files to be added to
|
|
999
|
+
The source files to be added to user projects are:
|
|
995
1000
|
|
|
996
1001
|
- `src/micro-test-plus.cpp`
|
|
997
1002
|
- `src/test-reporter.cpp`
|
|
@@ -1031,8 +1036,8 @@ namespace defines the literals (like `1_i`);
|
|
|
1031
1036
|
|
|
1032
1037
|
#### CMake
|
|
1033
1038
|
|
|
1034
|
-
To integrate the µTest++ source library into a CMake application,
|
|
1035
|
-
folder to the build:
|
|
1039
|
+
To integrate the µTest++ source library into a CMake application,
|
|
1040
|
+
add this folder to the build:
|
|
1036
1041
|
|
|
1037
1042
|
```cmake
|
|
1038
1043
|
add_subdirectory("xpacks/micro-os-plus-micro-test-plus")`
|
|
@@ -1050,8 +1055,8 @@ target_link_libraries(your-target PRIVATE
|
|
|
1050
1055
|
|
|
1051
1056
|
#### meson
|
|
1052
1057
|
|
|
1053
|
-
To integrate the µTest++ source library into a meson application,
|
|
1054
|
-
folder to the build:
|
|
1058
|
+
To integrate the µTest++ source library into a meson application,
|
|
1059
|
+
add this folder to the build:
|
|
1055
1060
|
|
|
1056
1061
|
```meson
|
|
1057
1062
|
subdir('xpacks/micro-os-plus-micro-test-plus')
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@micro-os-plus/micro-test-plus",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.1",
|
|
4
4
|
"description": "A source library xPack with µTest++, a lightweight testing framework for embedded platforms",
|
|
5
5
|
"main": "",
|
|
6
6
|
"scripts": {
|
|
@@ -37,11 +37,11 @@
|
|
|
37
37
|
"@xpack-dev-tools/cmake": "3.21.6-1.1",
|
|
38
38
|
"@xpack-dev-tools/meson-build": "0.60.3-1.1",
|
|
39
39
|
"@xpack-dev-tools/ninja-build": "1.10.2-5.1",
|
|
40
|
-
"@micro-os-plus/build-helper": "2.
|
|
41
|
-
"@micro-os-plus/diag-trace": "
|
|
40
|
+
"@micro-os-plus/build-helper": "^2.11.0",
|
|
41
|
+
"@micro-os-plus/diag-trace": "^4.1.1"
|
|
42
42
|
},
|
|
43
43
|
"xpack": {
|
|
44
|
-
"minimumXpmRequired": "0.
|
|
44
|
+
"minimumXpmRequired": "0.13.7",
|
|
45
45
|
"properties": {
|
|
46
46
|
"buildFolderRelativePath": "{{ 'build' | path_join: configuration.name | to_filename | downcase }}",
|
|
47
47
|
"buildFolderRelativePathPosix": "{{ 'build' | path_posix_join: configuration.name | downcase }}",
|
|
@@ -85,11 +85,7 @@
|
|
|
85
85
|
],
|
|
86
86
|
"test-cortexm": [
|
|
87
87
|
"xpm run test-qemu-mps2-an386-cmake",
|
|
88
|
-
"xpm run test-qemu-mps2-an386-meson"
|
|
89
|
-
"{% if os.platform == 'linux' %}xpm run test-stm32f4discovery-cmake{% endif %}",
|
|
90
|
-
"{% if os.platform == 'darwin' and os.arch == 'x64' %}xpm run test-stm32f4discovery-cmake{% endif %}",
|
|
91
|
-
"{% if os.platform == 'linux' %}xpm run test-stm32f4discovery-meson{% endif %}",
|
|
92
|
-
"{% if os.platform == 'darwin' and os.arch == 'x64' %}xpm run test-stm32f4discovery-meson{% endif %}"
|
|
88
|
+
"xpm run test-qemu-mps2-an386-meson"
|
|
93
89
|
],
|
|
94
90
|
"test-native-cmake": [
|
|
95
91
|
"xpm run prepare --config native-cmake-debug",
|
|
@@ -171,22 +167,6 @@
|
|
|
171
167
|
"xpm run build --config qemu-mps2-an386-meson-release",
|
|
172
168
|
"xpm run test --config qemu-mps2-an386-meson-release"
|
|
173
169
|
],
|
|
174
|
-
"test-stm32f4discovery-cmake": [
|
|
175
|
-
"xpm run prepare --config stm32f4discovery-cmake-debug",
|
|
176
|
-
"xpm run build --config stm32f4discovery-cmake-debug",
|
|
177
|
-
"xpm run test --config stm32f4discovery-cmake-debug",
|
|
178
|
-
"xpm run prepare --config stm32f4discovery-cmake-release",
|
|
179
|
-
"xpm run build --config stm32f4discovery-cmake-release",
|
|
180
|
-
"xpm run test --config stm32f4discovery-cmake-release"
|
|
181
|
-
],
|
|
182
|
-
"test-stm32f4discovery-meson": [
|
|
183
|
-
"xpm run prepare --config stm32f4discovery-meson-debug",
|
|
184
|
-
"xpm run build --config stm32f4discovery-meson-debug",
|
|
185
|
-
"xpm run test --config stm32f4discovery-meson-debug",
|
|
186
|
-
"xpm run prepare --config stm32f4discovery-meson-release",
|
|
187
|
-
"xpm run build --config stm32f4discovery-meson-release",
|
|
188
|
-
"xpm run test --config stm32f4discovery-meson-release"
|
|
189
|
-
],
|
|
190
170
|
"clean-all": [
|
|
191
171
|
"xpm run clean --config native-cmake-debug",
|
|
192
172
|
"xpm run clean --config native-cmake-release",
|
|
@@ -207,11 +187,7 @@
|
|
|
207
187
|
"xpm run clean --config qemu-mps2-an386-cmake-debug",
|
|
208
188
|
"xpm run clean --config qemu-mps2-an386-cmake-release",
|
|
209
189
|
"xpm run clean --config qemu-mps2-an386-meson-debug",
|
|
210
|
-
"xpm run clean --config qemu-mps2-an386-meson-release"
|
|
211
|
-
"xpm run clean --config stm32f4discovery-cmake-debug",
|
|
212
|
-
"xpm run clean --config stm32f4discovery-cmake-release",
|
|
213
|
-
"xpm run clean --config stm32f4discovery-meson-debug",
|
|
214
|
-
"xpm run clean --config stm32f4discovery-meson-release"
|
|
190
|
+
"xpm run clean --config qemu-mps2-an386-meson-release"
|
|
215
191
|
],
|
|
216
192
|
"deep-clean": "rm -rf build node_modules xpacks",
|
|
217
193
|
"trigger-workflow-test-all": "bash tests/scripts/trigger-workflow-test-all.sh"
|
|
@@ -239,24 +215,11 @@
|
|
|
239
215
|
}
|
|
240
216
|
},
|
|
241
217
|
"native-cmake-release": {
|
|
218
|
+
"inherit": [
|
|
219
|
+
"native-cmake-debug"
|
|
220
|
+
],
|
|
242
221
|
"properties": {
|
|
243
|
-
"buildType": "Release"
|
|
244
|
-
"platformName": "native"
|
|
245
|
-
},
|
|
246
|
-
"actions": {
|
|
247
|
-
"link-deps": [
|
|
248
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
|
|
249
|
-
],
|
|
250
|
-
"prepare": "{{ properties.commandCMakePrepare }}",
|
|
251
|
-
"build": [
|
|
252
|
-
"{{ properties.commandCMakeReconfigure }}",
|
|
253
|
-
"{{ properties.commandCMakeBuild }}"
|
|
254
|
-
],
|
|
255
|
-
"test": "{{ properties.commandCMakePerformTests }}",
|
|
256
|
-
"clean": "{{ properties.commandCMakeClean }}"
|
|
257
|
-
},
|
|
258
|
-
"devDependencies": {
|
|
259
|
-
"@micro-os-plus/architecture-synthetic-posix": "4.0.0"
|
|
222
|
+
"buildType": "Release"
|
|
260
223
|
}
|
|
261
224
|
},
|
|
262
225
|
"native-cmake-gcc11-debug": {
|
|
@@ -283,26 +246,11 @@
|
|
|
283
246
|
}
|
|
284
247
|
},
|
|
285
248
|
"native-cmake-gcc11-release": {
|
|
249
|
+
"inherit": [
|
|
250
|
+
"native-cmake-gcc11-debug"
|
|
251
|
+
],
|
|
286
252
|
"properties": {
|
|
287
|
-
"buildType": "Release"
|
|
288
|
-
"platformName": "native",
|
|
289
|
-
"toolchainFileName": "gcc.cmake"
|
|
290
|
-
},
|
|
291
|
-
"actions": {
|
|
292
|
-
"link-deps": [
|
|
293
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
|
|
294
|
-
],
|
|
295
|
-
"prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
|
|
296
|
-
"build": [
|
|
297
|
-
"{{ properties.commandCMakeReconfigure }}",
|
|
298
|
-
"{{ properties.commandCMakeBuild }}"
|
|
299
|
-
],
|
|
300
|
-
"test": "{{ properties.commandCMakePerformTests }}",
|
|
301
|
-
"clean": "{{ properties.commandCMakeClean }}"
|
|
302
|
-
},
|
|
303
|
-
"devDependencies": {
|
|
304
|
-
"@xpack-dev-tools/gcc": "11.2.0-3.3",
|
|
305
|
-
"@micro-os-plus/architecture-synthetic-posix": "4.0.0"
|
|
253
|
+
"buildType": "Release"
|
|
306
254
|
}
|
|
307
255
|
},
|
|
308
256
|
"native-cmake-clang12-debug": {
|
|
@@ -329,26 +277,11 @@
|
|
|
329
277
|
}
|
|
330
278
|
},
|
|
331
279
|
"native-cmake-clang12-release": {
|
|
280
|
+
"inherit": [
|
|
281
|
+
"native-cmake-clang12-debug"
|
|
282
|
+
],
|
|
332
283
|
"properties": {
|
|
333
|
-
"buildType": "Release"
|
|
334
|
-
"platformName": "native",
|
|
335
|
-
"toolchainFileName": "clang.cmake"
|
|
336
|
-
},
|
|
337
|
-
"actions": {
|
|
338
|
-
"link-deps": [
|
|
339
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
|
|
340
|
-
],
|
|
341
|
-
"prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
|
|
342
|
-
"build": [
|
|
343
|
-
"{{ properties.commandCMakeReconfigure }}",
|
|
344
|
-
"{{ properties.commandCMakeBuild }}"
|
|
345
|
-
],
|
|
346
|
-
"test": "{{ properties.commandCMakePerformTests }}",
|
|
347
|
-
"clean": "{{ properties.commandCMakeClean }}"
|
|
348
|
-
},
|
|
349
|
-
"devDependencies": {
|
|
350
|
-
"@xpack-dev-tools/clang": "12.0.1-2.2",
|
|
351
|
-
"@micro-os-plus/architecture-synthetic-posix": "4.0.0"
|
|
284
|
+
"buildType": "Release"
|
|
352
285
|
}
|
|
353
286
|
},
|
|
354
287
|
"native-cmake-clang13-debug": {
|
|
@@ -375,26 +308,11 @@
|
|
|
375
308
|
}
|
|
376
309
|
},
|
|
377
310
|
"native-cmake-clang13-release": {
|
|
311
|
+
"inherit": [
|
|
312
|
+
"native-cmake-clang13-debug"
|
|
313
|
+
],
|
|
378
314
|
"properties": {
|
|
379
|
-
"buildType": "Release"
|
|
380
|
-
"platformName": "native",
|
|
381
|
-
"toolchainFileName": "clang.cmake"
|
|
382
|
-
},
|
|
383
|
-
"actions": {
|
|
384
|
-
"link-deps": [
|
|
385
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
|
|
386
|
-
],
|
|
387
|
-
"prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
|
|
388
|
-
"build": [
|
|
389
|
-
"{{ properties.commandCMakeReconfigure }}",
|
|
390
|
-
"{{ properties.commandCMakeBuild }}"
|
|
391
|
-
],
|
|
392
|
-
"test": "{{ properties.commandCMakePerformTests }}",
|
|
393
|
-
"clean": "{{ properties.commandCMakeClean }}"
|
|
394
|
-
},
|
|
395
|
-
"devDependencies": {
|
|
396
|
-
"@xpack-dev-tools/clang": "13.0.1-1.1",
|
|
397
|
-
"@micro-os-plus/architecture-synthetic-posix": "4.0.0"
|
|
315
|
+
"buildType": "Release"
|
|
398
316
|
}
|
|
399
317
|
},
|
|
400
318
|
"native-meson-debug": {
|
|
@@ -419,24 +337,11 @@
|
|
|
419
337
|
}
|
|
420
338
|
},
|
|
421
339
|
"native-meson-release": {
|
|
340
|
+
"inherit": [
|
|
341
|
+
"native-meson-debug"
|
|
342
|
+
],
|
|
422
343
|
"properties": {
|
|
423
|
-
"buildType": "release"
|
|
424
|
-
"platformName": "native"
|
|
425
|
-
},
|
|
426
|
-
"actions": {
|
|
427
|
-
"link-deps": [
|
|
428
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
|
|
429
|
-
],
|
|
430
|
-
"prepare": "{{ properties.commandMesonPrepare }}",
|
|
431
|
-
"build": [
|
|
432
|
-
"{{ properties.commandMesonReconfigure }}",
|
|
433
|
-
"{{ properties.commandMesonBuild }}"
|
|
434
|
-
],
|
|
435
|
-
"test": "{{ properties.commandMesonPerformTests }}",
|
|
436
|
-
"clean": "{{ properties.commandMesonClean }}"
|
|
437
|
-
},
|
|
438
|
-
"devDependencies": {
|
|
439
|
-
"@micro-os-plus/architecture-synthetic-posix": "4.0.0"
|
|
344
|
+
"buildType": "release"
|
|
440
345
|
}
|
|
441
346
|
},
|
|
442
347
|
"native-meson-gcc11-debug": {
|
|
@@ -463,26 +368,11 @@
|
|
|
463
368
|
}
|
|
464
369
|
},
|
|
465
370
|
"native-meson-gcc11-release": {
|
|
371
|
+
"inherit": [
|
|
372
|
+
"native-meson-gcc11-debug"
|
|
373
|
+
],
|
|
466
374
|
"properties": {
|
|
467
|
-
"buildType": "release"
|
|
468
|
-
"platformName": "native",
|
|
469
|
-
"toolchainFileName": "gcc-{{ os.platform }}.ini"
|
|
470
|
-
},
|
|
471
|
-
"actions": {
|
|
472
|
-
"link-deps": [
|
|
473
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
|
|
474
|
-
],
|
|
475
|
-
"prepare": "{{ properties.commandMesonPrepareWithToolchain }}",
|
|
476
|
-
"build": [
|
|
477
|
-
"{{ properties.commandMesonReconfigure }}",
|
|
478
|
-
"{{ properties.commandMesonBuild }}"
|
|
479
|
-
],
|
|
480
|
-
"test": "{{ properties.commandMesonPerformTests }}",
|
|
481
|
-
"clean": "{{ properties.commandMesonClean }}"
|
|
482
|
-
},
|
|
483
|
-
"devDependencies": {
|
|
484
|
-
"@xpack-dev-tools/gcc": "11.2.0-3.3",
|
|
485
|
-
"@micro-os-plus/architecture-synthetic-posix": "4.0.0"
|
|
375
|
+
"buildType": "release"
|
|
486
376
|
}
|
|
487
377
|
},
|
|
488
378
|
"native-meson-clang12-debug": {
|
|
@@ -509,26 +399,11 @@
|
|
|
509
399
|
}
|
|
510
400
|
},
|
|
511
401
|
"native-meson-clang12-release": {
|
|
402
|
+
"inherit": [
|
|
403
|
+
"native-meson-clang12-debug"
|
|
404
|
+
],
|
|
512
405
|
"properties": {
|
|
513
|
-
"buildType": "release"
|
|
514
|
-
"platformName": "native",
|
|
515
|
-
"toolchainFileName": "clang-{{ os.platform }}.ini"
|
|
516
|
-
},
|
|
517
|
-
"actions": {
|
|
518
|
-
"link-deps": [
|
|
519
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
|
|
520
|
-
],
|
|
521
|
-
"prepare": "{{ properties.commandMesonPrepareWithToolchain }}",
|
|
522
|
-
"build": [
|
|
523
|
-
"{{ properties.commandMesonReconfigure }}",
|
|
524
|
-
"{{ properties.commandMesonBuild }}"
|
|
525
|
-
],
|
|
526
|
-
"test": "{{ properties.commandMesonPerformTests }}",
|
|
527
|
-
"clean": "{{ properties.commandMesonClean }}"
|
|
528
|
-
},
|
|
529
|
-
"devDependencies": {
|
|
530
|
-
"@xpack-dev-tools/clang": "12.0.1-2.2",
|
|
531
|
-
"@micro-os-plus/architecture-synthetic-posix": "4.0.0"
|
|
406
|
+
"buildType": "release"
|
|
532
407
|
}
|
|
533
408
|
},
|
|
534
409
|
"native-meson-clang13-debug": {
|
|
@@ -555,26 +430,11 @@
|
|
|
555
430
|
}
|
|
556
431
|
},
|
|
557
432
|
"native-meson-clang13-release": {
|
|
433
|
+
"inherit": [
|
|
434
|
+
"native-meson-clang13-debug"
|
|
435
|
+
],
|
|
558
436
|
"properties": {
|
|
559
|
-
"buildType": "release"
|
|
560
|
-
"platformName": "native",
|
|
561
|
-
"toolchainFileName": "clang-{{ os.platform }}.ini"
|
|
562
|
-
},
|
|
563
|
-
"actions": {
|
|
564
|
-
"link-deps": [
|
|
565
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-synthetic-posix"
|
|
566
|
-
],
|
|
567
|
-
"prepare": "{{ properties.commandMesonPrepareWithToolchain }}",
|
|
568
|
-
"build": [
|
|
569
|
-
"{{ properties.commandMesonReconfigure }}",
|
|
570
|
-
"{{ properties.commandMesonBuild }}"
|
|
571
|
-
],
|
|
572
|
-
"test": "{{ properties.commandMesonPerformTests }}",
|
|
573
|
-
"clean": "{{ properties.commandMesonClean }}"
|
|
574
|
-
},
|
|
575
|
-
"devDependencies": {
|
|
576
|
-
"@xpack-dev-tools/clang": "13.0.1-1.1",
|
|
577
|
-
"@micro-os-plus/architecture-synthetic-posix": "4.0.0"
|
|
437
|
+
"buildType": "release"
|
|
578
438
|
}
|
|
579
439
|
},
|
|
580
440
|
"qemu-mps2-an386-cmake-debug": {
|
|
@@ -592,8 +452,6 @@
|
|
|
592
452
|
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
|
|
593
453
|
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
|
|
594
454
|
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-qemu-cortexm",
|
|
595
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
|
|
596
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
|
|
597
455
|
"xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
|
|
598
456
|
"xpm link --config {{ configuration.name }} @micro-os-plus/startup",
|
|
599
457
|
"xpm link --config {{ configuration.name }} @micro-os-plus/version",
|
|
@@ -608,36 +466,30 @@
|
|
|
608
466
|
"clean": "{{ properties.commandCMakeClean }}"
|
|
609
467
|
},
|
|
610
468
|
"devDependencies": {
|
|
611
|
-
"@xpack-dev-tools/arm-none-eabi-gcc": "
|
|
612
|
-
"@xpack-dev-tools/qemu-arm": "
|
|
613
|
-
"@micro-os-plus/architecture-cortexm": "
|
|
469
|
+
"@xpack-dev-tools/arm-none-eabi-gcc": "11.2.1-1.2.2",
|
|
470
|
+
"@xpack-dev-tools/qemu-arm": "7.0.0-1.1",
|
|
471
|
+
"@micro-os-plus/architecture-cortexm": "6.2.0",
|
|
614
472
|
"@micro-os-plus/devices-cortexm": "3.0.0",
|
|
615
|
-
"@micro-os-plus/devices-qemu-cortexm": "
|
|
616
|
-
"@micro-os-plus/
|
|
617
|
-
"@micro-os-plus/
|
|
618
|
-
"@micro-os-plus/semihosting": "4.0.0",
|
|
619
|
-
"@micro-os-plus/startup": "3.0.0",
|
|
473
|
+
"@micro-os-plus/devices-qemu-cortexm": "4.1.1",
|
|
474
|
+
"@micro-os-plus/semihosting": "7.1.0",
|
|
475
|
+
"@micro-os-plus/startup": "5.2.0",
|
|
620
476
|
"@micro-os-plus/version": "7.1.2",
|
|
621
477
|
"@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
|
|
622
478
|
}
|
|
623
479
|
},
|
|
624
480
|
"qemu-mps2-an386-cmake-release": {
|
|
481
|
+
"inherit": [
|
|
482
|
+
"qemu-mps2-an386-cmake-debug"
|
|
483
|
+
],
|
|
625
484
|
"properties": {
|
|
626
485
|
"buildType": "MinSizeRel",
|
|
627
|
-
"
|
|
628
|
-
"toolchainFileName": "arm-none-eabi-gcc.cmake",
|
|
629
|
-
"qemuBoardName": "QEMU mps2-an386",
|
|
630
|
-
"shortConfigurationName": "q1r",
|
|
631
|
-
"buildFolderRelativePath": "{% if os.platform != 'win32' %}{{ 'build' | path_join: configuration.name | to_filename | downcase }}{% else %}{{ 'build' | path_join: properties.shortConfigurationName | to_filename | downcase }}{% endif %}",
|
|
632
|
-
"buildFolderRelativePathPosix": "{% if os.platform != 'win32' %}{{ 'build' | path_posix_join: configuration.name | downcase }}{% else %}{{ 'build' | path_posix_join: properties.shortConfigurationName | downcase }}{% endif %}"
|
|
486
|
+
"shortConfigurationName": "q1r"
|
|
633
487
|
},
|
|
634
488
|
"actions": {
|
|
635
489
|
"link-deps": [
|
|
636
490
|
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
|
|
637
491
|
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
|
|
638
492
|
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-qemu-cortexm",
|
|
639
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
|
|
640
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
|
|
641
493
|
"xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
|
|
642
494
|
"xpm link --config {{ configuration.name }} @micro-os-plus/startup",
|
|
643
495
|
"xpm link --config {{ configuration.name }} @micro-os-plus/version",
|
|
@@ -652,15 +504,13 @@
|
|
|
652
504
|
"clean": "{{ properties.commandCMakeClean }}"
|
|
653
505
|
},
|
|
654
506
|
"devDependencies": {
|
|
655
|
-
"@xpack-dev-tools/arm-none-eabi-gcc": "
|
|
656
|
-
"@xpack-dev-tools/qemu-arm": "
|
|
657
|
-
"@micro-os-plus/architecture-cortexm": "
|
|
507
|
+
"@xpack-dev-tools/arm-none-eabi-gcc": "11.2.1-1.2.2",
|
|
508
|
+
"@xpack-dev-tools/qemu-arm": "7.0.0-1.1",
|
|
509
|
+
"@micro-os-plus/architecture-cortexm": "6.2.0",
|
|
658
510
|
"@micro-os-plus/devices-cortexm": "3.0.0",
|
|
659
|
-
"@micro-os-plus/devices-qemu-cortexm": "
|
|
660
|
-
"@micro-os-plus/
|
|
661
|
-
"@micro-os-plus/
|
|
662
|
-
"@micro-os-plus/semihosting": "4.0.0",
|
|
663
|
-
"@micro-os-plus/startup": "3.0.0",
|
|
511
|
+
"@micro-os-plus/devices-qemu-cortexm": "4.1.1",
|
|
512
|
+
"@micro-os-plus/semihosting": "7.1.0",
|
|
513
|
+
"@micro-os-plus/startup": "5.2.0",
|
|
664
514
|
"@micro-os-plus/version": "7.1.2",
|
|
665
515
|
"@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
|
|
666
516
|
}
|
|
@@ -677,8 +527,6 @@
|
|
|
677
527
|
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
|
|
678
528
|
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
|
|
679
529
|
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-qemu-cortexm",
|
|
680
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
|
|
681
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
|
|
682
530
|
"xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
|
|
683
531
|
"xpm link --config {{ configuration.name }} @micro-os-plus/startup",
|
|
684
532
|
"xpm link --config {{ configuration.name }} @micro-os-plus/version",
|
|
@@ -693,228 +541,23 @@
|
|
|
693
541
|
"clean": "{{ properties.commandMesonClean }}"
|
|
694
542
|
},
|
|
695
543
|
"devDependencies": {
|
|
696
|
-
"@xpack-dev-tools/arm-none-eabi-gcc": "
|
|
697
|
-
"@xpack-dev-tools/qemu-arm": "
|
|
698
|
-
"@micro-os-plus/architecture-cortexm": "
|
|
544
|
+
"@xpack-dev-tools/arm-none-eabi-gcc": "11.2.1-1.2.2",
|
|
545
|
+
"@xpack-dev-tools/qemu-arm": "7.0.0-1.1",
|
|
546
|
+
"@micro-os-plus/architecture-cortexm": "6.2.0",
|
|
699
547
|
"@micro-os-plus/devices-cortexm": "3.0.0",
|
|
700
|
-
"@micro-os-plus/devices-qemu-cortexm": "
|
|
701
|
-
"@micro-os-plus/
|
|
702
|
-
"@micro-os-plus/
|
|
703
|
-
"@micro-os-plus/semihosting": "4.0.0",
|
|
704
|
-
"@micro-os-plus/startup": "3.0.0",
|
|
548
|
+
"@micro-os-plus/devices-qemu-cortexm": "4.1.1",
|
|
549
|
+
"@micro-os-plus/semihosting": "7.1.0",
|
|
550
|
+
"@micro-os-plus/startup": "5.2.0",
|
|
705
551
|
"@micro-os-plus/version": "7.1.2",
|
|
706
552
|
"@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
|
|
707
553
|
}
|
|
708
554
|
},
|
|
709
555
|
"qemu-mps2-an386-meson-release": {
|
|
556
|
+
"inherit": [
|
|
557
|
+
"qemu-mps2-an386-meson-debug"
|
|
558
|
+
],
|
|
710
559
|
"properties": {
|
|
711
|
-
"buildType": "minsize"
|
|
712
|
-
"platformName": "qemu-mps2-an386",
|
|
713
|
-
"toolchainFileName": "arm-none-eabi-gcc-{{ os.platform }}.ini",
|
|
714
|
-
"qemuBoardName": "QEMU mps2-an386"
|
|
715
|
-
},
|
|
716
|
-
"actions": {
|
|
717
|
-
"link-deps": [
|
|
718
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
|
|
719
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
|
|
720
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-qemu-cortexm",
|
|
721
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
|
|
722
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
|
|
723
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
|
|
724
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/startup",
|
|
725
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/version",
|
|
726
|
-
"xpm link --config {{ configuration.name }} @xpack-3rd-party/arm-cmsis-core"
|
|
727
|
-
],
|
|
728
|
-
"prepare": "{{ properties.commandMesonPrepareCross }}",
|
|
729
|
-
"build": [
|
|
730
|
-
"{{ properties.commandMesonReconfigure }}",
|
|
731
|
-
"{{ properties.commandMesonBuild }}"
|
|
732
|
-
],
|
|
733
|
-
"test": "{{ properties.commandMesonPerformTests }}",
|
|
734
|
-
"clean": "{{ properties.commandMesonClean }}"
|
|
735
|
-
},
|
|
736
|
-
"devDependencies": {
|
|
737
|
-
"@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
|
|
738
|
-
"@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
|
|
739
|
-
"@micro-os-plus/architecture-cortexm": "5.0.0",
|
|
740
|
-
"@micro-os-plus/devices-cortexm": "3.0.0",
|
|
741
|
-
"@micro-os-plus/devices-qemu-cortexm": "3.0.0",
|
|
742
|
-
"@micro-os-plus/libs-c": "3.0.0",
|
|
743
|
-
"@micro-os-plus/libs-cpp": "3.0.0",
|
|
744
|
-
"@micro-os-plus/semihosting": "4.0.0",
|
|
745
|
-
"@micro-os-plus/startup": "3.0.0",
|
|
746
|
-
"@micro-os-plus/version": "7.1.2",
|
|
747
|
-
"@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
|
|
748
|
-
}
|
|
749
|
-
},
|
|
750
|
-
"stm32f4discovery-cmake-debug": {
|
|
751
|
-
"properties": {
|
|
752
|
-
"buildType": "Debug",
|
|
753
|
-
"platformName": "stm32f4discovery",
|
|
754
|
-
"toolchainFileName": "arm-none-eabi-gcc.cmake",
|
|
755
|
-
"qemuBoardName": "STM32F4-Discovery"
|
|
756
|
-
},
|
|
757
|
-
"actions": {
|
|
758
|
-
"link-deps": [
|
|
759
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
|
|
760
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
|
|
761
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-stm32f4-extras",
|
|
762
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
|
|
763
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
|
|
764
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/platform-stm32f4discovery",
|
|
765
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
|
|
766
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/startup",
|
|
767
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/version"
|
|
768
|
-
],
|
|
769
|
-
"prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
|
|
770
|
-
"build": [
|
|
771
|
-
"{{ properties.commandCMakeReconfigure }}",
|
|
772
|
-
"{{ properties.commandCMakeBuild }}"
|
|
773
|
-
],
|
|
774
|
-
"test": "{{ properties.commandCMakePerformTests }}",
|
|
775
|
-
"clean": "{{ properties.commandCMakeClean }}"
|
|
776
|
-
},
|
|
777
|
-
"devDependencies": {
|
|
778
|
-
"@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
|
|
779
|
-
"@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
|
|
780
|
-
"@micro-os-plus/architecture-cortexm": "5.0.0",
|
|
781
|
-
"@micro-os-plus/devices-cortexm": "3.0.0",
|
|
782
|
-
"@micro-os-plus/devices-stm32f4-extras": "2.2.2",
|
|
783
|
-
"@micro-os-plus/libs-c": "3.0.0",
|
|
784
|
-
"@micro-os-plus/libs-cpp": "3.0.0",
|
|
785
|
-
"@micro-os-plus/platform-stm32f4discovery": "3.3.1",
|
|
786
|
-
"@micro-os-plus/semihosting": "4.0.0",
|
|
787
|
-
"@micro-os-plus/startup": "3.0.0",
|
|
788
|
-
"@micro-os-plus/version": "7.1.2",
|
|
789
|
-
"@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
|
|
790
|
-
}
|
|
791
|
-
},
|
|
792
|
-
"stm32f4discovery-cmake-release": {
|
|
793
|
-
"properties": {
|
|
794
|
-
"buildType": "MinSizeRel",
|
|
795
|
-
"platformName": "stm32f4discovery",
|
|
796
|
-
"toolchainFileName": "arm-none-eabi-gcc.cmake",
|
|
797
|
-
"qemuBoardName": "STM32F4-Discovery"
|
|
798
|
-
},
|
|
799
|
-
"actions": {
|
|
800
|
-
"link-deps": [
|
|
801
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
|
|
802
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
|
|
803
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-stm32f4-extras",
|
|
804
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
|
|
805
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
|
|
806
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/platform-stm32f4discovery",
|
|
807
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
|
|
808
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/startup",
|
|
809
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/version"
|
|
810
|
-
],
|
|
811
|
-
"prepare": "{{ properties.commandCMakePrepareWithToolchain }}",
|
|
812
|
-
"build": [
|
|
813
|
-
"{{ properties.commandCMakeReconfigure }}",
|
|
814
|
-
"{{ properties.commandCMakeBuild }}"
|
|
815
|
-
],
|
|
816
|
-
"test": "{{ properties.commandCMakePerformTests }}",
|
|
817
|
-
"clean": "{{ properties.commandCMakeClean }}"
|
|
818
|
-
},
|
|
819
|
-
"devDependencies": {
|
|
820
|
-
"@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
|
|
821
|
-
"@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
|
|
822
|
-
"@micro-os-plus/architecture-cortexm": "5.0.0",
|
|
823
|
-
"@micro-os-plus/devices-cortexm": "3.0.0",
|
|
824
|
-
"@micro-os-plus/devices-stm32f4-extras": "2.2.2",
|
|
825
|
-
"@micro-os-plus/libs-c": "3.0.0",
|
|
826
|
-
"@micro-os-plus/libs-cpp": "3.0.0",
|
|
827
|
-
"@micro-os-plus/platform-stm32f4discovery": "3.3.1",
|
|
828
|
-
"@micro-os-plus/semihosting": "4.0.0",
|
|
829
|
-
"@micro-os-plus/startup": "3.0.0",
|
|
830
|
-
"@micro-os-plus/version": "7.1.2",
|
|
831
|
-
"@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
|
|
832
|
-
}
|
|
833
|
-
},
|
|
834
|
-
"stm32f4discovery-meson-debug": {
|
|
835
|
-
"properties": {
|
|
836
|
-
"buildType": "debug",
|
|
837
|
-
"platformName": "stm32f4discovery",
|
|
838
|
-
"toolchainFileName": "arm-none-eabi-gcc.ini",
|
|
839
|
-
"toolchainWindowsFileName": "arm-none-eabi-gcc-cmd.ini",
|
|
840
|
-
"qemuBoardName": "STM32F4-Discovery"
|
|
841
|
-
},
|
|
842
|
-
"actions": {
|
|
843
|
-
"link-deps": [
|
|
844
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
|
|
845
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
|
|
846
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-stm32f4-extras",
|
|
847
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
|
|
848
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
|
|
849
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/platform-stm32f4discovery",
|
|
850
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
|
|
851
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/startup",
|
|
852
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/version"
|
|
853
|
-
],
|
|
854
|
-
"prepare": "{{ properties.commandMesonPrepareCross }}",
|
|
855
|
-
"build": [
|
|
856
|
-
"{{ properties.commandMesonReconfigure }}",
|
|
857
|
-
"{{ properties.commandMesonBuild }}"
|
|
858
|
-
],
|
|
859
|
-
"test": "{{ properties.commandMesonPerformTests }}",
|
|
860
|
-
"clean": "{{ properties.commandMesonClean }}"
|
|
861
|
-
},
|
|
862
|
-
"devDependencies": {
|
|
863
|
-
"@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
|
|
864
|
-
"@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
|
|
865
|
-
"@micro-os-plus/architecture-cortexm": "5.0.0",
|
|
866
|
-
"@micro-os-plus/devices-cortexm": "3.0.0",
|
|
867
|
-
"@micro-os-plus/devices-stm32f4-extras": "2.2.2",
|
|
868
|
-
"@micro-os-plus/libs-c": "3.0.0",
|
|
869
|
-
"@micro-os-plus/libs-cpp": "3.0.0",
|
|
870
|
-
"@micro-os-plus/platform-stm32f4discovery": "3.3.1",
|
|
871
|
-
"@micro-os-plus/semihosting": "4.0.0",
|
|
872
|
-
"@micro-os-plus/startup": "3.0.0",
|
|
873
|
-
"@micro-os-plus/version": "7.1.2",
|
|
874
|
-
"@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
|
|
875
|
-
}
|
|
876
|
-
},
|
|
877
|
-
"stm32f4discovery-meson-release": {
|
|
878
|
-
"properties": {
|
|
879
|
-
"buildType": "minsize",
|
|
880
|
-
"platformName": "stm32f4discovery",
|
|
881
|
-
"toolchainFileName": "arm-none-eabi-gcc.ini",
|
|
882
|
-
"toolchainWindowsFileName": "arm-none-eabi-gcc-cmd.ini",
|
|
883
|
-
"qemuBoardName": "STM32F4-Discovery"
|
|
884
|
-
},
|
|
885
|
-
"actions": {
|
|
886
|
-
"link-deps": [
|
|
887
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/architecture-cortexm",
|
|
888
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-cortexm",
|
|
889
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/devices-stm32f4-extras",
|
|
890
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-c",
|
|
891
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/libs-cpp",
|
|
892
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/platform-stm32f4discovery",
|
|
893
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/semihosting",
|
|
894
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/startup",
|
|
895
|
-
"xpm link --config {{ configuration.name }} @micro-os-plus/version"
|
|
896
|
-
],
|
|
897
|
-
"prepare": "{{ properties.commandMesonPrepareCross }}",
|
|
898
|
-
"build": [
|
|
899
|
-
"{{ properties.commandMesonReconfigure }}",
|
|
900
|
-
"{{ properties.commandMesonBuild }}"
|
|
901
|
-
],
|
|
902
|
-
"test": "{{ properties.commandMesonPerformTests }}",
|
|
903
|
-
"clean": "{{ properties.commandMesonClean }}"
|
|
904
|
-
},
|
|
905
|
-
"devDependencies": {
|
|
906
|
-
"@xpack-dev-tools/arm-none-eabi-gcc": "10.3.1-2.3.1",
|
|
907
|
-
"@xpack-dev-tools/qemu-arm": "6.2.0-1.1",
|
|
908
|
-
"@micro-os-plus/architecture-cortexm": "5.0.0",
|
|
909
|
-
"@micro-os-plus/devices-cortexm": "3.0.0",
|
|
910
|
-
"@micro-os-plus/devices-stm32f4-extras": "2.2.2",
|
|
911
|
-
"@micro-os-plus/libs-c": "3.0.0",
|
|
912
|
-
"@micro-os-plus/libs-cpp": "3.0.0",
|
|
913
|
-
"@micro-os-plus/platform-stm32f4discovery": "3.3.1",
|
|
914
|
-
"@micro-os-plus/semihosting": "4.0.0",
|
|
915
|
-
"@micro-os-plus/startup": "3.0.0",
|
|
916
|
-
"@micro-os-plus/version": "7.1.2",
|
|
917
|
-
"@xpack-3rd-party/arm-cmsis-core": "5.4.0-6"
|
|
560
|
+
"buildType": "minsize"
|
|
918
561
|
}
|
|
919
562
|
}
|
|
920
563
|
}
|
package/src/test-runner.cpp
CHANGED
|
@@ -56,6 +56,7 @@ namespace micro_os_plus::micro_test_plus
|
|
|
56
56
|
|
|
57
57
|
default_suite_name_ = name;
|
|
58
58
|
|
|
59
|
+
#if !defined(MICRO_OS_PLUS_INCLUDE_STARTUP)
|
|
59
60
|
#if defined(MICRO_OS_PLUS_DEBUG)
|
|
60
61
|
printf ("argv[");
|
|
61
62
|
for (int i = 0; i < argc; ++i)
|
|
@@ -67,7 +68,8 @@ namespace micro_os_plus::micro_test_plus
|
|
|
67
68
|
printf ("'%s'", argv[i]);
|
|
68
69
|
}
|
|
69
70
|
puts ("]");
|
|
70
|
-
#endif
|
|
71
|
+
#endif // defined(MICRO_OS_PLUS_DEBUG)
|
|
72
|
+
#endif // !defined(MICRO_OS_PLUS_INCLUDE_STARTUP)
|
|
71
73
|
|
|
72
74
|
verbosity_t verbosity = verbosity::normal;
|
|
73
75
|
for (int i = 0; i < argc; ++i)
|
|
@@ -91,6 +93,7 @@ namespace micro_os_plus::micro_test_plus
|
|
|
91
93
|
|
|
92
94
|
// ------------------------------------------------------------------------
|
|
93
95
|
|
|
96
|
+
#if !defined(MICRO_OS_PLUS_INCLUDE_STARTUP)
|
|
94
97
|
if (verbosity == verbosity::normal || verbosity == verbosity::verbose)
|
|
95
98
|
{
|
|
96
99
|
#if defined(__clang__)
|
|
@@ -121,6 +124,7 @@ namespace micro_os_plus::micro_test_plus
|
|
|
121
124
|
#endif
|
|
122
125
|
puts (".");
|
|
123
126
|
}
|
|
127
|
+
#endif // !defined(MICRO_OS_PLUS_INCLUDE_STARTUP)
|
|
124
128
|
|
|
125
129
|
// ------------------------------------------------------------------------
|
|
126
130
|
|
|
@@ -157,7 +161,7 @@ namespace micro_os_plus::micro_test_plus
|
|
|
157
161
|
}
|
|
158
162
|
if (reporter.verbosity != verbosity::silent)
|
|
159
163
|
{
|
|
160
|
-
printf ("\n");
|
|
164
|
+
// printf ("\n");
|
|
161
165
|
}
|
|
162
166
|
}
|
|
163
167
|
return was_successful ? 0 : 1;
|