diff --git a/.circleci/config.yml b/.circleci/config.yml index d9e41b3..de3ab50 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,9 +86,7 @@ jobs: llvm-12-dev \ ninja-build \ pkg-config \ - python3-setuptools \ - sudo \ - xsltproc + python3-setuptools pip3 install toml environment: DEBIAN_FRONTEND: noninteractive @@ -110,14 +108,7 @@ jobs: ctest --test-dir build/test/ --test-action Test -j$(nproc) \ --no-compress-output --output-on-failure \ --exclude-regex 'TestTypes\/ComparativeTest\..*' \ - --schedule-random --timeout 30 --repeat until-pass:2 - - - run: - name: Convert test results - when: always - command: | - mkdir -p build/results/ctest - bash test/convert_to_junit.sh build/test - + --schedule-random --timeout 30 --repeat until-pass:2 \ + --output-junit results.xml - store_test_results: - path: build/results + path: build/test/results.xml diff --git a/test/convert_to_junit.sh b/test/convert_to_junit.sh deleted file mode 100755 index 58cf60b..0000000 --- a/test/convert_to_junit.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -e -set -u - -ctest2junit_xsl=$(readlink -f `dirname ${BASH_SOURCE[0]}`)/ctest_to_junit.xsl -tests_dir=$1 - -if [ ! -d $tests_dir ]; -then - echo "ERROR! $tests_dir is not directory!" - exit 1 -fi - -tag=$(head -n 1 $tests_dir/Testing/TAG) -xsltproc --output build/results/ctest/results.xml $ctest2junit_xsl $tests_dir/Testing/$tag/Test.xml - -echo "Test report converted successfully" - diff --git a/test/ctest_to_junit.xsl b/test/ctest_to_junit.xsl deleted file mode 100644 index b95eccd..0000000 --- a/test/ctest_to_junit.xsl +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BuildName: - BuildStamp: - Name: - Generator: - CompilerName: - OSName: - Hostname: - OSRelease: - OSVersion: - OSPlatform: - Is64Bits: - VendorString: - VendorID: - FamilyID: - ModelID: - ProcessorCacheSize: - NumberOfLogicalCPU: - NumberOfPhysicalCPU: - TotalVirtualMemory: - TotalPhysicalMemory: - LogicalProcessorsPerPhysical: - ProcessorClockFrequency: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -