From 55f6d57d81f23f623a1da5332961cd3ff05f3199 Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Sat, 11 Jun 2022 20:07:43 -0500 Subject: [PATCH 01/13] -Add CI. --- .github/workflows/ci.yaml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/ci.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 000000000..62463b772 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,39 @@ +name: Run Python Tests +on: + push: + branches: + - '*' + pull_request: + branches: + - develop + +jobs: + build: + runs-on: ${{matrix.os}} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-latest] + steps: + - uses: actions/checkout@v2 + - name: Install Python 3 + uses: actions/setup-python@v1 + with: + python-version: 3.6 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r src/requirements.txt + sudo apt-get install libdwarf-dev + sudo apt-get install libelf-dev + sudo apt-get install libsqlite3-dev + sudo apt-get install g++ + - name: Checkout submodules + run: git submodule update --init --recursive + - name: Run tests with pytest + run: pytest --cov=src --cov=xtce_generator --cov=tlm_cmd_merger + - name: Coveralls + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + coveralls --service=github + From 5956decfb0cd79f6427461a826ef1a2ef61bba71 Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Sat, 11 Jun 2022 20:21:31 -0500 Subject: [PATCH 02/13] -Add CI. --- .github/workflows/ci.yaml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 62463b772..81f75fbf5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,4 +1,4 @@ -name: Run Python Tests +name: Build obc-fixedwing-sitl on: push: branches: @@ -21,19 +21,26 @@ jobs: python-version: 3.6 - name: Install dependencies run: | - python -m pip install --upgrade pip - pip install -r src/requirements.txt sudo apt-get install libdwarf-dev sudo apt-get install libelf-dev sudo apt-get install libsqlite3-dev sudo apt-get install g++ + sudo apt-get install libgazebo9-dev + sudo apt-get install libboost-all-dev + sudo apt-get install python3-opencv + sudo apt-get install libopencv-dev + sudo apt-get install libgstreamer-plugins-base1.0-dev + sudo apt-get install default-jre + sudo apt-get install openjdk-8-jdk + sudo apt-get install gcc-multilib + sudo apt-get install g++-multilib + sudo apt-get install cmake + sudo apt-get install libeigen3-dev + sudo apt-get install librxtx-java + python -m pip install --upgrade pip + pip install -r src/requirements.txt - name: Checkout submodules run: git submodule update --init --recursive - name: Run tests with pytest run: pytest --cov=src --cov=xtce_generator --cov=tlm_cmd_merger - - name: Coveralls - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - coveralls --service=github From 8915496896952e992e9e57250453eb7740981d9e Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Thu, 14 Jul 2022 12:23:09 -0500 Subject: [PATCH 03/13] -Add CI --- .github/workflows/ci.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 81f75fbf5..9aaa855b1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,22 +21,22 @@ jobs: python-version: 3.6 - name: Install dependencies run: | - sudo apt-get install libdwarf-dev - sudo apt-get install libelf-dev - sudo apt-get install libsqlite3-dev - sudo apt-get install g++ - sudo apt-get install libgazebo9-dev - sudo apt-get install libboost-all-dev - sudo apt-get install python3-opencv - sudo apt-get install libopencv-dev - sudo apt-get install libgstreamer-plugins-base1.0-dev - sudo apt-get install default-jre - sudo apt-get install openjdk-8-jdk - sudo apt-get install gcc-multilib - sudo apt-get install g++-multilib - sudo apt-get install cmake - sudo apt-get install libeigen3-dev - sudo apt-get install librxtx-java + sudo apt-get install -y libdwarf-dev + sudo apt-get install -y libelf-dev + sudo apt-get install -y libsqlite3-dev + sudo apt-get install -y g++ + sudo apt-get install -y libgazebo9-dev + sudo apt-get install -y libboost-all-dev + sudo apt-get install -y python3-opencv + sudo apt-get install -y libopencv-dev + sudo apt-get install -y libgstreamer-plugins-base1.0-dev + sudo apt-get install -y default-jre + sudo apt-get install -y openjdk-8-jdk + sudo apt-get install -y gcc-multilib + sudo apt-get install -y g++-multilib + sudo apt-get install -y cmake + sudo apt-get install -y libeigen3-dev + sudo apt-get install -y librxtx-java python -m pip install --upgrade pip pip install -r src/requirements.txt - name: Checkout submodules From 7a90950a85392afc03736331ff365c7393257cee Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Thu, 14 Jul 2022 12:34:37 -0500 Subject: [PATCH 04/13] -Add CI --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9aaa855b1..f18d4bd9c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,6 +21,7 @@ jobs: python-version: 3.6 - name: Install dependencies run: | + sudo apt-get update sudo apt-get install -y libdwarf-dev sudo apt-get install -y libelf-dev sudo apt-get install -y libsqlite3-dev From f9f634e262cdf4b0e1a8a6f5380bf21a037450e3 Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Thu, 14 Jul 2022 12:44:26 -0500 Subject: [PATCH 05/13] -Add CI --- .github/workflows/ci.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f18d4bd9c..4763a7078 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,9 +39,12 @@ jobs: sudo apt-get install -y libeigen3-dev sudo apt-get install -y librxtx-java python -m pip install --upgrade pip - pip install -r src/requirements.txt - name: Checkout submodules - run: git submodule update --init --recursive - - name: Run tests with pytest - run: pytest --cov=src --cov=xtce_generator --cov=tlm_cmd_merger + run: | + git submodule update --init --recursive + - name: Build gemini2-sitl + run: | + make python-env + source venv/bin/activate + make gemini2-sitl From 473bf6ffc969ba6d1b58222b46e63a135eebba1c Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Thu, 14 Jul 2022 13:14:07 -0500 Subject: [PATCH 06/13] -Add CI --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4763a7078..599f3c6b6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,8 @@ jobs: sudo apt-get install -y cmake sudo apt-get install -y libeigen3-dev sudo apt-get install -y librxtx-java - python -m pip install --upgrade pip + python3 -m pip install --upgrade pip + pip3 install virtualenv - name: Checkout submodules run: | git submodule update --init --recursive From 1add7cda6c5d9fe82e55b1967760b2bb49eddf0b Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Thu, 14 Jul 2022 18:00:20 -0500 Subject: [PATCH 07/13] -Add --nostdin flag to yaml-merge. This prevents CI from failing. --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index dee273e03..efa5c687d 100644 --- a/Makefile +++ b/Makefile @@ -144,8 +144,8 @@ quad-workspace:: @echo 'Generating CPD ground tools data.' @make -C build/multirotor/quad/cpd/target ground-tools @echo 'Adding XTCE configuration to registries.' - @yaml-merge core/base/tools/commander/xtce_config.yaml build/multirotor/quad/cpd/target/wh_defs.yaml --overwrite build/multirotor/quad/cpd/target/wh_defs.yaml - @yaml-merge core/base/tools/commander/xtce_config.yaml build/multirotor/quad/ppd/target/wh_defs.yaml --overwrite build/multirotor/quad/ppd/target/wh_defs.yaml + @yaml-merge core/base/tools/commander/xtce_config.yaml build/multirotor/quad/cpd/target/wh_defs.yaml --nostdin --overwrite build/multirotor/quad/cpd/target/wh_defs.yaml + @yaml-merge core/base/tools/commander/xtce_config.yaml build/multirotor/quad/ppd/target/wh_defs.yaml --nostdin --overwrite build/multirotor/quad/ppd/target/wh_defs.yaml @echo 'Generating combined registry.' @rm -Rf build/multirotor/quad/commander_workspace >/dev/null @mkdir -p build/multirotor/quad/commander_workspace/etc @@ -164,8 +164,8 @@ gemini2-workspace:: @echo 'Generating CPD ground tools data.' @make -C build/fixedwing/gemini2/cpd/target ground-tools @echo 'Adding XTCE configuration to registries.' - @yaml-merge core/base/tools/commander/xtce_config.yaml build/fixedwing/gemini2/cpd/target/wh_defs.yaml --overwrite build/fixedwing/gemini2/cpd/target/wh_defs.yaml - @yaml-merge core/base/tools/commander/xtce_config.yaml build/fixedwing/gemini2/ppd/target/wh_defs.yaml --overwrite build/fixedwing/gemini2/ppd/target/wh_defs.yaml + @yaml-merge core/base/tools/commander/xtce_config.yaml build/fixedwing/gemini2/cpd/target/wh_defs.yaml --nostdin --overwrite build/fixedwing/gemini2/cpd/target/wh_defs.yaml + @yaml-merge core/base/tools/commander/xtce_config.yaml build/fixedwing/gemini2/ppd/target/wh_defs.yaml --nostdin --overwrite build/fixedwing/gemini2/ppd/target/wh_defs.yaml @echo 'Generating combined registry.' @rm -Rf build/fixedwing/gemini2/commander_workspace >/dev/null @mkdir -p build/fixedwing/gemini2/commander_workspace/etc @@ -187,9 +187,9 @@ workspace-quad-sitl:: @echo 'Generating Simlink ground tools data.' @make -C build/multirotor/quad/simlink/target ground-tools @echo 'Adding XTCE configuration to registries.' - @yaml-merge core/base/tools/commander/xtce_config.yaml build/multirotor/quad/cpd/sitl/target/wh_defs.yaml --overwrite build/multirotor/quad/cpd/sitl/target/wh_defs.yaml - @yaml-merge core/base/tools/commander/xtce_config.yaml build/multirotor/quad/ppd/sitl/target/wh_defs.yaml --overwrite build/multirotor/quad/ppd/sitl/target/wh_defs.yaml - @yaml-merge core/base/tools/commander/xtce_config.yaml build/multirotor/quad/simlink/target/wh_defs.yaml --overwrite build/multirotor/quad/simlink/target/wh_defs.yaml + @yaml-merge core/base/tools/commander/xtce_config.yaml build/multirotor/quad/cpd/sitl/target/wh_defs.yaml --nostdin --overwrite build/multirotor/quad/cpd/sitl/target/wh_defs.yaml + @yaml-merge core/base/tools/commander/xtce_config.yaml build/multirotor/quad/ppd/sitl/target/wh_defs.yaml --nostdin --overwrite build/multirotor/quad/ppd/sitl/target/wh_defs.yaml + @yaml-merge core/base/tools/commander/xtce_config.yaml build/multirotor/quad/simlink/target/wh_defs.yaml --nostdin --overwrite build/multirotor/quad/simlink/target/wh_defs.yaml @echo 'Generating combined registry.' @rm -Rf build/multirotor/quad/sitl_commander_workspace >/dev/null @mkdir -p build/multirotor/quad/sitl_commander_workspace/etc @@ -213,9 +213,9 @@ gemini2-sitl-workspace:: @echo 'Generating Simlink ground tools data.' @make -C build/fixedwing/gemini2/simlink/target ground-tools @echo 'Adding XTCE configuration to registries.' - @yaml-merge core/base/tools/commander/xtce_config.yaml build/fixedwing/gemini2/cpd/sitl/target/wh_defs.yaml --overwrite build/fixedwing/gemini2/cpd/sitl/target/wh_defs.yaml - @yaml-merge core/base/tools/commander/xtce_config.yaml build/fixedwing/gemini2/ppd/sitl/target/wh_defs.yaml --overwrite build/fixedwing/gemini2/ppd/sitl/target/wh_defs.yaml - @yaml-merge core/base/tools/commander/xtce_config.yaml build/fixedwing/gemini2/simlink/target/wh_defs.yaml --overwrite build/fixedwing/gemini2/simlink/target/wh_defs.yaml + @yaml-merge core/base/tools/commander/xtce_config.yaml build/fixedwing/gemini2/cpd/sitl/target/wh_defs.yaml --nostdin --overwrite build/fixedwing/gemini2/cpd/sitl/target/wh_defs.yaml + @yaml-merge core/base/tools/commander/xtce_config.yaml build/fixedwing/gemini2/ppd/sitl/target/wh_defs.yaml --nostdin --overwrite build/fixedwing/gemini2/ppd/sitl/target/wh_defs.yaml + @yaml-merge core/base/tools/commander/xtce_config.yaml build/fixedwing/gemini2/simlink/target/wh_defs.yaml --nostdin --overwrite build/fixedwing/gemini2/simlink/target/wh_defs.yaml @echo 'Generating combined registry.' @rm -Rf build/fixedwing/gemini2/sitl_commander_workspace >/dev/null @mkdir -p build/fixedwing/gemini2/sitl_commander_workspace/etc From 6ef422bc09c4a0d4b00310038067748e50bbd15f Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Fri, 15 Jul 2022 18:14:52 -0500 Subject: [PATCH 08/13] -Add gazebo to the build again. --- .../gemini2/simlink/host/CMakeLists.txt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/config/fixedwing/gemini2/simlink/host/CMakeLists.txt b/config/fixedwing/gemini2/simlink/host/CMakeLists.txt index b046e0313..523ee5648 100644 --- a/config/fixedwing/gemini2/simlink/host/CMakeLists.txt +++ b/config/fixedwing/gemini2/simlink/host/CMakeLists.txt @@ -13,15 +13,15 @@ buildliner_build_cfe_host_tools( -#add_subdirectory(${PROJECT_SOURCE_DIR}/tools/sitl_gazebo gazebo) -#set(GAZEBO_PLUGIN_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/gazebo) -#set(GAZEBO_WORLDS_DIR ${PROJECT_SOURCE_DIR}/tools/sitl_gazebo/worlds) -#set(GAZEBO_MODELS_DIR ${PROJECT_SOURCE_DIR}/tools/sitl_gazebo/models) -#set(JMAVSIM_DIR ${PROJECT_SOURCE_DIR}/tools/jMAVSim) -#target_include_directories(gazebo_gst_camera_plugin PRIVATE "/usr/include/gstreamer-1.0") -#target_include_directories(gazebo_gst_camera_plugin PRIVATE "/usr/include/glib-2.0") -#target_include_directories(gazebo_gst_camera_plugin PRIVATE "/usr/lib/x86_64-linux-gnu/glib-2.0/include") -#target_include_directories(gazebo_gst_camera_plugin PRIVATE "/usr/lib/x86_64-linux-gnu/gstreamer-1.0/include") -# -#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/start-gazebo.in ${CMAKE_CURRENT_BINARY_DIR}/start-gazebo @ONLY) -#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/start-jmavsim.in ${CMAKE_CURRENT_BINARY_DIR}/start-jmavsim @ONLY) +add_subdirectory(${PROJECT_SOURCE_DIR}/tools/sitl_gazebo gazebo) +set(GAZEBO_PLUGIN_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/gazebo) +set(GAZEBO_WORLDS_DIR ${PROJECT_SOURCE_DIR}/tools/sitl_gazebo/worlds) +set(GAZEBO_MODELS_DIR ${PROJECT_SOURCE_DIR}/tools/sitl_gazebo/models) +set(JMAVSIM_DIR ${PROJECT_SOURCE_DIR}/tools/jMAVSim) +target_include_directories(gazebo_gst_camera_plugin PRIVATE "/usr/include/gstreamer-1.0") +target_include_directories(gazebo_gst_camera_plugin PRIVATE "/usr/include/glib-2.0") +target_include_directories(gazebo_gst_camera_plugin PRIVATE "/usr/lib/x86_64-linux-gnu/glib-2.0/include") +target_include_directories(gazebo_gst_camera_plugin PRIVATE "/usr/lib/x86_64-linux-gnu/gstreamer-1.0/include") + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/start-gazebo.in ${CMAKE_CURRENT_BINARY_DIR}/start-gazebo @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/start-jmavsim.in ${CMAKE_CURRENT_BINARY_DIR}/start-jmavsim @ONLY) From 3bd74521047b8d9666de9e047de5d846e707b0df Mon Sep 17 00:00:00 2001 From: Mathew Benson Date: Sun, 17 Jul 2022 22:09:18 -0500 Subject: [PATCH 09/13] Fixed gcov builds. --- core/base/psp/make/build-functions.cmake | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/core/base/psp/make/build-functions.cmake b/core/base/psp/make/build-functions.cmake index 5a3c87742..465d5289c 100644 --- a/core/base/psp/make/build-functions.cmake +++ b/core/base/psp/make/build-functions.cmake @@ -245,12 +245,12 @@ function(psp_add_executable) target_link_libraries(${TARGET_BINARY} PUBLIC ${PARSED_ARGS_LIBS}) endif() - if(PARSED_ARGS_COMPILE_FLAGS) + if(COMPILE_FLAGS OR PARSED_ARGS_COMPILE_FLAGS) set_target_properties(${TARGET_BINARY_WITHOUT_SYMTAB} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} ${PARSED_ARGS_COMPILE_FLAGS}") set_target_properties(${TARGET_BINARY} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} ${PARSED_ARGS_COMPILE_FLAGS}") endif() - - if(PARSED_ARGS_LINK_FLAGS) + + if(LINK_FLAGS OR PARSED_ARGS_LINK_FLAGS) set_target_properties(${TARGET_BINARY_WITHOUT_SYMTAB} PROPERTIES LINK_FLAGS "${LINK_FLAGS} ${PARSED_ARGS_LINK_FLAGS}") set_target_properties(${TARGET_BINARY} PROPERTIES LINK_FLAGS "${LINK_FLAGS} ${PARSED_ARGS_LINK_FLAGS}") endif() @@ -281,17 +281,6 @@ function(psp_add_executable) set_target_properties(${TARGET_BINARY_WITHOUT_SYMTAB} PROPERTIES ENABLE_EXPORTS TRUE) set_target_properties(${TARGET_BINARY} PROPERTIES ENABLE_EXPORTS TRUE) - # Add in the various flags also supplied by the PSP. - if(COMPILE_FLAGS) - set_target_properties(${TARGET_BINARY_WITHOUT_SYMTAB} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) - set_target_properties(${TARGET_BINARY} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) - endif() - if(LINK_FLAGS) - set_target_properties(${TARGET_BINARY_WITHOUT_SYMTAB} PROPERTIES LINK_FLAGS ${LINK_FLAGS}) - set_target_properties(${TARGET_BINARY_WITH_SYMTAB} PROPERTIES LINK_FLAGS ${LINK_FLAGS}) - set_target_properties(${TARGET_BINARY} PROPERTIES LINK_FLAGS ${LINK_FLAGS}) - endif() - # Link in the various libraries specified by the PSP target_link_libraries(${TARGET_BINARY_WITHOUT_SYMTAB} PUBLIC ${LINK_FLAGS} ${PSP_LIBS}) target_link_libraries(${TARGET_BINARY} PUBLIC ${LINK_FLAGS} ${PSP_LIBS}) @@ -718,6 +707,7 @@ function(psp_buildliner_add_app_unit_test) ) if(${GCOV_SUPPORTED}) + psp_add_executable(${PARSED_ARGS_TARGET}-gcov EXCLUDE_FROM_ALL From 3786d460038a137dbff7f2b9a825ecd54c443ffd Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Tue, 19 Jul 2022 14:01:09 -0500 Subject: [PATCH 10/13] -Add generate_coverage --- core/base/tools/ci/generate_coverage.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 core/base/tools/ci/generate_coverage.sh diff --git a/core/base/tools/ci/generate_coverage.sh b/core/base/tools/ci/generate_coverage.sh new file mode 100755 index 000000000..fd8e11ca3 --- /dev/null +++ b/core/base/tools/ci/generate_coverage.sh @@ -0,0 +1,8 @@ +#!/bin/bash +#Example: software/airliner/public/core/base/tools/ci/generate_coverage.sh software/airliner/public/build/fixedwing/gemini2/cpd/sitl/target +DIR="$1" +lcov -c -i -b $DIR -d $DIR -o Coverage.baseline +lcov -c -d $DIR -b $DIR -o Coverage.out +lcov -a Coverage.baseline -a Coverage.out -o Coverage.combined +lcov -r Coverage.combined /usr/include/\* -o Coverage.combined +genhtml Coverage.combined -o HTML From c8dae05f19db88fcac0a9acfe884d6441a9ee5f7 Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Tue, 19 Jul 2022 18:47:03 -0500 Subject: [PATCH 11/13] -Output txt files from generate_coverage for CI. --- core/base/tools/ci/generate_coverage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/base/tools/ci/generate_coverage.sh b/core/base/tools/ci/generate_coverage.sh index fd8e11ca3..77ca6be64 100755 --- a/core/base/tools/ci/generate_coverage.sh +++ b/core/base/tools/ci/generate_coverage.sh @@ -3,6 +3,6 @@ DIR="$1" lcov -c -i -b $DIR -d $DIR -o Coverage.baseline lcov -c -d $DIR -b $DIR -o Coverage.out -lcov -a Coverage.baseline -a Coverage.out -o Coverage.combined -lcov -r Coverage.combined /usr/include/\* -o Coverage.combined -genhtml Coverage.combined -o HTML +lcov -a Coverage.baseline -a Coverage.out -o Coverage.txt +lcov -r Coverage.txt /usr/include/\* -o Coverage.txt +genhtml Coverage.txt -o HTML From 601c90e248a890177af22b3688d5c2c8703cac35 Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Tue, 19 Jul 2022 19:26:57 -0500 Subject: [PATCH 12/13] -Output xml files from generate_coverage for CI. --- core/base/tools/ci/generate_coverage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/base/tools/ci/generate_coverage.sh b/core/base/tools/ci/generate_coverage.sh index 77ca6be64..6c30a03c6 100755 --- a/core/base/tools/ci/generate_coverage.sh +++ b/core/base/tools/ci/generate_coverage.sh @@ -3,6 +3,6 @@ DIR="$1" lcov -c -i -b $DIR -d $DIR -o Coverage.baseline lcov -c -d $DIR -b $DIR -o Coverage.out -lcov -a Coverage.baseline -a Coverage.out -o Coverage.txt -lcov -r Coverage.txt /usr/include/\* -o Coverage.txt -genhtml Coverage.txt -o HTML +lcov -a Coverage.baseline -a Coverage.out -o Coverage.xml +lcov -r Coverage.xml /usr/include/\* -o Coverage.xml +genhtml Coverage.xml -o HTML From 68c1bdd3a2554af088c8d54210cb61c61bc6efe9 Mon Sep 17 00:00:00 2001 From: lorenzo-gomez-windhover Date: Wed, 20 Jul 2022 12:17:34 -0500 Subject: [PATCH 13/13] -Output txt files from generate_coverage for CI. --- core/base/tools/ci/generate_coverage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/base/tools/ci/generate_coverage.sh b/core/base/tools/ci/generate_coverage.sh index 6c30a03c6..77ca6be64 100755 --- a/core/base/tools/ci/generate_coverage.sh +++ b/core/base/tools/ci/generate_coverage.sh @@ -3,6 +3,6 @@ DIR="$1" lcov -c -i -b $DIR -d $DIR -o Coverage.baseline lcov -c -d $DIR -b $DIR -o Coverage.out -lcov -a Coverage.baseline -a Coverage.out -o Coverage.xml -lcov -r Coverage.xml /usr/include/\* -o Coverage.xml -genhtml Coverage.xml -o HTML +lcov -a Coverage.baseline -a Coverage.out -o Coverage.txt +lcov -r Coverage.txt /usr/include/\* -o Coverage.txt +genhtml Coverage.txt -o HTML