Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add app config command line switch for test and make #2593

Merged
merged 3 commits into from
Sep 10, 2016

Conversation

ConorPKeegan
Copy link
Contributor

@ConorPKeegan ConorPKeegan commented Aug 31, 2016

Changes

  • Add command line switch --app-config to specify the location of an app config file to use in options.py
  • Add support for specifying app config in mbed test and mbed make

Example

This is an example use of the switch, where test.json is in the format of a mbed_app.json file

$ python test.py --compile -m K64F -t GCC_ARM --app-config test.json

@ConorPKeegan
Copy link
Contributor Author

@mazimkhan Please can you review this

@theotherjimmy
Copy link
Contributor

Thanks for the PR. I really appreciate that you added the documentation where appropriate.

@bridadan
Copy link
Contributor

Seems fine to me, I think it'd make sense to add this to make.py as well.

I think in another PR we should look at taking the shared options that apply only when building full projects (aka linking stuff) and moving them to one location, similar to what's here: https://github.com/ARMmbed/mbed-os/blob/master/tools/options.py

@mazimkhan
Copy link

@bridadan we originally thought of adding this option for test, apps and libs. But found that handling of app config and lib config is different. Hence we focused only on app config.
Also, design of build tools is bit confusing. There are multiple entry points test.py, make.py and build.py. I think this is an area of improvement and consolidation.
To be least intrusive we only focused on building tests.

If you feel we can add this option in make.py as well. Also corresponding changes maybe needed in mbed-cli as well @ConorPKeegan.

@ConorPKeegan
Copy link
Contributor Author

@mazimkhan It should be fairly straight forward to add this to make.py

@mazimkhan
Copy link

@ConorPKeegan yup I understand. May be something @bridadan can guide. Would it good idea to move the --app-config option addition in options.py.

@ConorPKeegan
Copy link
Contributor Author

@mazimkhan @bridadan If --app-config is going to be used across multiple files, I think it would be worth adding it to options.py in the same way as --clean

@ConorPKeegan ConorPKeegan changed the title Add app config command line switch for test Add app config command line switch for test and make Sep 1, 2016
@bridadan
Copy link
Contributor

bridadan commented Sep 1, 2016

@ConorPKeegan Changes look ok to me!

@ConorPKeegan
Copy link
Contributor Author

@sg- @screamerbg Can we get this merged?

@sg-
Copy link
Contributor

sg- commented Sep 9, 2016

@ConorPKeegan needs a rebase

@ConorPKeegan ConorPKeegan force-pushed the devel_app_config_switch branch from 7c288b9 to ac51eb6 Compare September 10, 2016 14:50
@ConorPKeegan
Copy link
Contributor Author

@sg- I have rebased this change

@sg- sg- removed the needs: work label Sep 10, 2016
@sg-
Copy link
Contributor

sg- commented Sep 10, 2016

@mbed-bot: TEST

HOST_OSES=ALL
BUILD_TOOLCHAINS=ALL
TARGETS=ALL

@sg-
Copy link
Contributor

sg- commented Sep 10, 2016

/morph test

@mbed-bot
Copy link

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 825

All builds and test passed!

@sg- sg- merged commit c3737b4 into ARMmbed:master Sep 10, 2016
@mbed-bot
Copy link

[Build 906]
FAILURE: Something went wrong when building and testing.

theotherjimmy added a commit that referenced this pull request Sep 19, 2016
Release mbed-os-5.1.4

Changes:

New Targets:
2504: [Disco_F769NI] adding new target [#2504]
2654: DELTA_DFBM_NQ620 platform porting [#2654]
2615: [MTM_MTCONNECT04S] Added support for MTM_MTCONNECT04S [#2615]
2548: Nucleof303ze [#2548]

Fixes:

2678: Fixing NCS36510 compile on Linux #2678
2657: [MAX326xx] Removed echoing of characters and carriage return. #2657
2651: Use lp_timer to count time in the deepsleep tests #2651
2645: NUCLEO_F446ZE - Enable mbed5 release version #2645
2643: Fix thread self termination #2643
2634: Updated USBHost for library changes #2634
2633: Updated USBDevice to use Callback #2633
2630: Test names not dependent on disk location of root #2630
2624: CFSTORE Bugfix for realloc() moving KV area and cfstore_file_t data structures not being updated correctly #2624
2623: DISCO_L476VG - Add Serial Flow Control pins + add SERIAL_FC macro #2623
2617: STM32F2xx - Enable Serial Flow Control #2617
2613: Correctly providing directories to build_apis #2613
2607: Fix uvisor memory tracing #2607
2604: Tools - Fix fill section size variation #2604
2601: Adding ON Semiconductor copyright notice to source and header files. #2601
2597: [HAL] Fixed "intrinsic is deprecated" warnings #2597
2596: [HAL] Improve memory tracer #2596
2594: Fix TCPServer constructor #2594
2593: Add app config command line switch for test and make #2593
2589: [NUC472] Fix heap configuration error with armcc #2589
2588: Timing tests drift refactor #2588
2587: add PTEx pins as option for SPI on Hexiwear - for SD Card Interface #2587
2584: Set size of callback irq array to IrqCnt #2584
2583: github issue and PR templates #2583
2582: [GCC_CR] fix runtime hang for baremetal build #2582
2580: lwip - Add check for previously-bound socket #2580
2579: lwip - Fix handling of max sockets in socket_accept #2579
2578: Fix double free in NanostackInterface #2578
2576: Add smoke test that builds example programs with mbed-cli #2576
2575: tools-config! -  Allow an empty or mal-formed config to be passed to the config system #2575
2562: Fix GCC lazy init race condition and add test #2562
2559: [utest]: Allow the linker to remove any part of utest if not used #2559
2545: Added define guards for SEQUENTIAL_FLASH_JOURNAL_MAX_LOGGED_BLOBS so  #2545
2538: STM32F4xx - Add support of ADC internal channels (Temp, VRef, VBat) #2538
2521: [NUCLEO_F207ZG] Add MBED5 capability #2521
2514: Updated FlexCan and SAI SDK drivers #2514
2487: Runtime dynamic memory tracing #2487
2442: Malloc heap info #2442
2419: [STM32F1] Add asynchronous serial #2419
2393: [tools] Prevent trace-backs from incomplete args #2393
2245: Refactor export subsystem #2245
2130: stm32 : reduce number of device.h files #2130
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants