CI: improve code separation in C++ tests mechanism

This commit is contained in:
0penBrain
2023-04-27 19:23:54 +02:00
committed by Chris Hennes
parent 7015d38f97
commit db3935b699
4 changed files with 52 additions and 21 deletions

View File

@@ -21,34 +21,59 @@
# * *
# ***************************************************************************
# !!! Each step running a single test shall have an'id' defined so its report will be output
name: Run all C++ Tests
description: "Run all C++ tests, generating logs and reports for each"
inputs:
reportdir:
description: "Report directory"
description: "Report directory where logs will be stored"
required: true
builddir:
description: "Build directory"
description: "Build directory where tests are located"
required: true
reportfilename:
description: "Report filename"
reportFile:
description: "Path for report file"
required: true
runs:
using: "composite"
steps:
- name: C++ core tests
id: core
uses: ./.github/workflows/actions/runCPPTests/runSingleTest
with:
testCommand: ${{ inputs.builddir }}/tests/Tests_run --gtest_output=json:${{ inputs.reportdir }}core_gtest_results.json
testLogFile: ${{ inputs.reportdir }}core_gtest_test_log.txt
reportFile: ${{ inputs.reportdir }}${{ inputs.reportfilename }}
testName: Core
- name: C++ Sketcher tests
id: sketcher
uses: ./.github/workflows/actions/runCPPTests/runSingleTest
with:
testCommand: ${{ inputs.builddir }}/tests/Sketcher_tests_run --gtest_output=json:${{ inputs.reportdir }}sketcher_gtest_results.json
testLogFile: ${{ inputs.reportdir }}sketcher_gtest_test_log.txt
reportFile: ${{ inputs.reportdir }}${{ inputs.reportfilename }}
testName: Sketcher
- name: Compose summary report based on test results
if: always()
shell: bash
run: |
# Printing global result
if [ ${{ job.status }} != "success" ]
then
echo "<details><summary>:fire: C++ tests failed</summary>" >> ${{ inputs.reportFile }}
else
echo "<details><summary>:heavy_check_mark: C++ tests succeeded</summary>" >> ${{ inputs.reportFile }}
fi
echo "" >> ${{ inputs.reportFile }}
echo "<blockquote>" >> ${{ inputs.reportFile }}
#Extract individual results
cat > /tmp/data << "EOD"
${{ toJSON(steps) }}
EOD
echo "$(jq -r ".[].outputs.reportText" /tmp/data)" >> ${{ inputs.reportFile }}
# Close report
echo "</blockquote>" >> ${{ inputs.reportFile }}
echo "</details>" >> ${{ inputs.reportFile }}
echo "" >> ${{ inputs.reportFile }}

View File

@@ -32,12 +32,13 @@ inputs:
testLogFile:
description: "Path for the command-line output of the tests"
required: true
reportFile:
description: "Report file"
required: true
testName:
description: "A descriptive name for the test suite"
required: true
outputs:
reportText:
description: "Report text"
value: ${{ steps.report.outputs.reportText }}
runs:
using: "composite"
@@ -47,20 +48,25 @@ runs:
run: stdbuf -oL -eL ${{ inputs.testCommand }} |& tee -a ${{ inputs.testLogFile }}
- name: Parse test results
if: always()
id: report
shell: bash
run: |
result=$(sed -ne "/Global test environment tear-down/,/^$/{/^$/d;p}" ${{ inputs.testLogFile }})
if grep -qF "[ FAILED ]" <<< $result
then
echo "<details><summary>:fire: GTest C++ test suite '${{ inputs.testName }}' failed</summary>" >> ${{ inputs.reportFile }}
reportText="<details><summary>:fire: GTest C++ test suite '${{ inputs.testName }}' failed</summary>\n"
else
echo "<details><summary>:heavy_check_mark: GTest C++ test suite '${{ inputs.testName }}' succeeded</summary>" >> ${{ inputs.reportFile }}
reportText="<details><summary>:heavy_check_mark: GTest C++ test suite '${{ inputs.testName }}' succeeded</summary>\n"
fi
echo "" >> ${{ inputs.reportFile }}
echo "Results" >> ${{ inputs.reportFile }}
echo "" >> ${{ inputs.reportFile }}
echo '```' >> ${{ inputs.reportFile }}
echo "$result" >> ${{ inputs.reportFile }}
echo '```' >> ${{ inputs.reportFile }}
echo "</details>">> ${{ inputs.reportFile }}
echo "" >> ${{ inputs.reportFile }}
reportText+="\n"
reportText+="Results\n"
reportText+="\n"
reportText+='```\n'
reportText+="$result\n"
reportText+='```\n'
reportText+="</details>\n"
reportText+="\n"
echo "reportText<<EOD" >> $GITHUB_OUTPUT
echo -e "$reportText" >> $GITHUB_OUTPUT
echo "EOD" >> $GITHUB_OUTPUT
echo -e "$reportText"

View File

@@ -208,7 +208,7 @@ jobs:
with:
reportdir: ${{ env.reportdir }}
builddir: ${{ env.builddir }}
reportfilename: ${{ env.reportfilename }}
reportFile: ${{ env.reportdir }}${{ env.reportfilename }}
- name: CMake Install
uses: ./.github/workflows/actions/linux/install
with:

View File

@@ -206,7 +206,7 @@ jobs:
with:
reportdir: ${{ env.reportdir }}
builddir: ${{ env.builddir }}
reportfilename: ${{ env.reportfilename }}
reportFile: ${{ env.reportdir }}${{ env.reportfilename }}
- name: CMake Install
uses: ./.github/workflows/actions/linux/install
with: