diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f8170b..1ceb09a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,6 +128,7 @@ if(ENABLE_LLVM_COVERAGE) coverage_llvm COMMAND ${CMAKE_COMMAND} -E env LLVM_PROFILE_FILE=${CMAKE_BINARY_DIR}/coverage/%p-%m.profraw + PRIVATEBIN_IT=0 ctest -C $,${CMAKE_BUILD_TYPE},$> --output-on-failure COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/coverage COMMAND ${LLVM_PROFDATA} merge -sparse ${CMAKE_BINARY_DIR}/coverage/*.profraw -o ${CMAKE_BINARY_DIR}/coverage/merged.profdata diff --git a/build-clang/Testing/Temporary/CTestCostData.txt b/build-clang/Testing/Temporary/CTestCostData.txt index 18612bd..f7f7dfd 100644 --- a/build-clang/Testing/Temporary/CTestCostData.txt +++ b/build-clang/Testing/Temporary/CTestCostData.txt @@ -1,5 +1,4 @@ -test_basic 11 0 +test_basic 12 0.570438 example_run 0 0 --- -test_basic example_run diff --git a/build-clang/coverage/m.profraw b/build-clang/coverage/m.profraw index aaa1f8b..5970642 100644 Binary files a/build-clang/coverage/m.profraw and b/build-clang/coverage/m.profraw differ diff --git a/build-clang/coverage_llvm.vcxproj b/build-clang/coverage_llvm.vcxproj index 3126a6b..fdb7073 100644 --- a/build-clang/coverage_llvm.vcxproj +++ b/build-clang/coverage_llvm.vcxproj @@ -112,7 +112,7 @@ cd C:\Users\mbusc\source\repos\privatebin-cpp\build-clang if %errorlevel% neq 0 goto :cmEnd C: if %errorlevel% neq 0 goto :cmEnd -"C:\Program Files\CMake\bin\cmake.exe" -E env LLVM_PROFILE_FILE=C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage/%p-%m.profraw ctest -C Debug --output-on-failure +"C:\Program Files\CMake\bin\cmake.exe" -E env LLVM_PROFILE_FILE=C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage/%p-%m.profraw PRIVATEBIN_IT=0 ctest -C Debug --output-on-failure if %errorlevel% neq 0 goto :cmEnd "C:\Program Files\CMake\bin\cmake.exe" -E make_directory C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage if %errorlevel% neq 0 goto :cmEnd @@ -138,7 +138,7 @@ cd C:\Users\mbusc\source\repos\privatebin-cpp\build-clang if %errorlevel% neq 0 goto :cmEnd C: if %errorlevel% neq 0 goto :cmEnd -"C:\Program Files\CMake\bin\cmake.exe" -E env LLVM_PROFILE_FILE=C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage/%p-%m.profraw ctest -C Release --output-on-failure +"C:\Program Files\CMake\bin\cmake.exe" -E env LLVM_PROFILE_FILE=C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage/%p-%m.profraw PRIVATEBIN_IT=0 ctest -C Release --output-on-failure if %errorlevel% neq 0 goto :cmEnd "C:\Program Files\CMake\bin\cmake.exe" -E make_directory C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage if %errorlevel% neq 0 goto :cmEnd @@ -164,7 +164,7 @@ cd C:\Users\mbusc\source\repos\privatebin-cpp\build-clang if %errorlevel% neq 0 goto :cmEnd C: if %errorlevel% neq 0 goto :cmEnd -"C:\Program Files\CMake\bin\cmake.exe" -E env LLVM_PROFILE_FILE=C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage/%p-%m.profraw ctest -C MinSizeRel --output-on-failure +"C:\Program Files\CMake\bin\cmake.exe" -E env LLVM_PROFILE_FILE=C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage/%p-%m.profraw PRIVATEBIN_IT=0 ctest -C MinSizeRel --output-on-failure if %errorlevel% neq 0 goto :cmEnd "C:\Program Files\CMake\bin\cmake.exe" -E make_directory C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage if %errorlevel% neq 0 goto :cmEnd @@ -190,7 +190,7 @@ cd C:\Users\mbusc\source\repos\privatebin-cpp\build-clang if %errorlevel% neq 0 goto :cmEnd C: if %errorlevel% neq 0 goto :cmEnd -"C:\Program Files\CMake\bin\cmake.exe" -E env LLVM_PROFILE_FILE=C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage/%p-%m.profraw ctest -C RelWithDebInfo --output-on-failure +"C:\Program Files\CMake\bin\cmake.exe" -E env LLVM_PROFILE_FILE=C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage/%p-%m.profraw PRIVATEBIN_IT=0 ctest -C RelWithDebInfo --output-on-failure if %errorlevel% neq 0 goto :cmEnd "C:\Program Files\CMake\bin\cmake.exe" -E make_directory C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage if %errorlevel% neq 0 goto :cmEnd diff --git a/build-clang/x64/Release/coverage_llvm/coverage_llvm.tlog/CustomBuild.command.1.tlog b/build-clang/x64/Release/coverage_llvm/coverage_llvm.tlog/CustomBuild.command.1.tlog index e398c84..c7bad63 100644 --- a/build-clang/x64/Release/coverage_llvm/coverage_llvm.tlog/CustomBuild.command.1.tlog +++ b/build-clang/x64/Release/coverage_llvm/coverage_llvm.tlog/CustomBuild.command.1.tlog @@ -4,7 +4,7 @@ cd C:\Users\mbusc\source\repos\privatebin-cpp\build-clang if %errorlevel% neq 0 goto :cmEnd C: if %errorlevel% neq 0 goto :cmEnd -"C:\Program Files\CMake\bin\cmake.exe" -E env LLVM_PROFILE_FILE=C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage/%p-%m.profraw ctest -C Release --output-on-failure +"C:\Program Files\CMake\bin\cmake.exe" -E env LLVM_PROFILE_FILE=C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage/%p-%m.profraw PRIVATEBIN_IT=0 ctest -C Release --output-on-failure if %errorlevel% neq 0 goto :cmEnd "C:\Program Files\CMake\bin\cmake.exe" -E make_directory C:/Users/mbusc/source/repos/privatebin-cpp/build-clang/coverage if %errorlevel% neq 0 goto :cmEnd diff --git a/scripts/create_release.ps1 b/scripts/create_release.ps1 index a074a59..7b285f9 100644 --- a/scripts/create_release.ps1 +++ b/scripts/create_release.ps1 @@ -102,6 +102,8 @@ try { & cmake @cmakeArgs | Out-Null if ($LASTEXITCODE -ne 0) { throw "CMake-Konfiguration für Coverage fehlgeschlagen" } + # Run coverage target with integration tests disabled to avoid rate limits + $env:PRIVATEBIN_IT = '0' & cmake --build build-clang --config Release --target coverage_llvm if ($LASTEXITCODE -ne 0) { throw "Coverage-Build fehlgeschlagen" } @@ -223,7 +225,7 @@ if (Test-Path $distPath) { foreach ($artifact in $artifacts) { Write-Host "Lade hoch: $($artifact.Name)..." -ForegroundColor Yellow - $uploadUri = "https://gitea.medisoftware.org/api/v1/repos/Markus/lib-privatebin/releases/$($release.id)/assets" + $uploadUri = "https://$gitHost/api/v1/repos/$owner/$repoName/releases/$($release.id)/assets" $boundary = [System.Guid]::NewGuid().ToString() $LF = "`r`n"