From 2b273388dd39288b9cca622c1d79920b91779a79 Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Tue, 18 Apr 2017 22:38:08 +0800 Subject: [PATCH] CI: save download config in CI build jobs: IDF built app download config may change with some modification. save the download configs for built APP in build stage. then we can use the correct download config in test stage. --- .gitlab-ci.yml | 3 +++ tools/unit-test-app/Makefile | 2 ++ 2 files changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25bf66a8bc..9f6447d4bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,6 +95,7 @@ build_esp_idf_tests: - ./tools/unit-test-app/build/*.bin - ./tools/unit-test-app/build/*.elf - ./tools/unit-test-app/build/*.map + - ./tools/unit-test-app/build/download.config - ./tools/unit-test-app/build/bootloader/*.bin - ./components/idf_test/unit_test/TestCaseAll.yml - ./components/idf_test/unit_test/CIConfigs/*.yml @@ -103,6 +104,8 @@ build_esp_idf_tests: script: - cd tools/unit-test-app - make TESTS_ALL=1 + # cut last line in case make V=0/1 is set by default + - make print_flash_cmd | tail -n 1 > build/download.config - python tools/UnitTestParser.py build_examples: diff --git a/tools/unit-test-app/Makefile b/tools/unit-test-app/Makefile index 128e8a0804..8ec75f82ef 100644 --- a/tools/unit-test-app/Makefile +++ b/tools/unit-test-app/Makefile @@ -7,3 +7,5 @@ PROJECT_NAME := unit-test-app include $(IDF_PATH)/make/project.mk +print_flash_cmd: + echo $(ESPTOOL_WRITE_FLASH_OPTIONS) $(ESPTOOL_ALL_FLASH_ARGS) | sed -e 's:'$(PWD)/build/'::g'