Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/tools/misc
diff options
context:
space:
mode:
authorLeitwolf2026-10-24 20:29:24 +0300
committerGitHub2026-10-24 20:29:24 +0300
commit13f81a480a93807c14dddb5abdb97355ced4d4c5 (patch)
treecd2055cb2eeb0bdef1d5bed1d39d9569df6f5b97 /tools/misc
parent4f1c759cffcb14bd6511e1d7c5fbace682e24f2d (diff)
parenta2edf60b9f410d26485ac7c0492870a0905f9545 (diff)
downloadcatch3-13f81a480a93807c14dddb5abdb97355ced4d4c5.tar.gz
Merge pull request #16 from Progmasoft/chore/remove-upstream-leftovers
Remove what Catch2's maintainers left that is not ours
Diffstat (limited to 'tools/misc')
-rw-r--r--tools/misc/CMakeLists.txt8
-rw-r--r--tools/misc/appveyorBuildConfigurationScript.bat21
-rw-r--r--tools/misc/appveyorMergeCoverageScript.py9
-rw-r--r--tools/misc/appveyorTestRunScript.bat17
-rw-r--r--tools/misc/coverage-helper.cpp142
-rw-r--r--tools/misc/installOpenCppCoverage.ps119
6 files changed, 0 insertions, 216 deletions
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
deleted file mode 100644
index 39e816a1..00000000
--- a/tools/misc/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-project(CatchCoverageHelper LANGUAGES CXX)
-
-add_executable(CoverageHelper coverage-helper.cpp)
-target_compile_features(CoverageHelper PRIVATE cxx_std_11)
-if(MSVC)
- target_compile_options(CoverageHelper PRIVATE /W4 /w44265 /WX /w44061 /w44062)
-endif()
diff --git a/tools/misc/appveyorBuildConfigurationScript.bat b/tools/misc/appveyorBuildConfigurationScript.bat
deleted file mode 100644
index 75b39550..00000000
--- a/tools/misc/appveyorBuildConfigurationScript.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-SETLOCAL EnableDelayedExpansion
-
-@REM # Possibilities:
-@REM # Debug build + coverage
-@REM # Debug build + examples
-@REM # Debug build + ---
-@REM # Release build
-if "%CONFIGURATION%"=="Debug" (
- if "%coverage%"=="1" (
- @REM # coverage needs to build the special helper as well as the main
- cmake -Stools/misc -Bbuild-misc -A%PLATFORM% || exit /b !ERRORLEVEL!
- cmake --build build-misc || exit /b !ERRORLEVEL!
- cmake -S. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DMEMORYCHECK_COMMAND=build-misc\Debug\CoverageHelper.exe -DMEMORYCHECK_COMMAND_OPTIONS=--sep-- -DMEMORYCHECK_TYPE=Valgrind -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% -DCATCH_ENABLE_CONFIGURE_TESTS=%configure_tests% -DCATCH_DEVELOPMENT_BUILD=ON || exit /b !ERRORLEVEL!
- ) else (
- @REM # We know that coverage is 0
- cmake -S. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% -DCATCH_BUILD_SURROGATES=%surrogates% -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_ENABLE_CONFIGURE_TESTS=%configure_tests% || exit /b !ERRORLEVEL!
- )
-)
-if "%CONFIGURATION%"=="Release" (
- cmake -S. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DCATCH_DEVELOPMENT_BUILD=ON || exit /b !ERRORLEVEL!
-)
diff --git a/tools/misc/appveyorMergeCoverageScript.py b/tools/misc/appveyorMergeCoverageScript.py
deleted file mode 100644
index 5b71f6e1..00000000
--- a/tools/misc/appveyorMergeCoverageScript.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-
-import glob
-import subprocess
-
-if __name__ == '__main__':
- cov_files = list(glob.glob('tests/cov-report*.bin'))
- base_cmd = ['OpenCppCoverage', '--quiet', '--export_type=cobertura:cobertura.xml'] + ['--input_coverage={}'.format(f) for f in cov_files]
- subprocess.check_call(base_cmd)
diff --git a/tools/misc/appveyorTestRunScript.bat b/tools/misc/appveyorTestRunScript.bat
deleted file mode 100644
index 661bae24..00000000
--- a/tools/misc/appveyorTestRunScript.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-SETLOCAL EnableDelayedExpansion
-
-rem Disable launching the JIT debugger for ctest.exe
-reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug\AutoExclusionList" /v "ctest.ext" /t REG_DWORD /d 1
-cd Build
-if "%CONFIGURATION%"=="Debug" (
- if "%coverage%"=="1" (
- ctest -j 2 -C %CONFIGURATION% -D ExperimentalMemCheck -LE uses-signals || exit /b !ERRORLEVEL!
- python ..\tools\misc\appveyorMergeCoverageScript.py || exit /b !ERRORLEVEL!
- codecov --root .. --no-color --disable gcov -f cobertura.xml -t %CODECOV_TOKEN% || exit /b !ERRORLEVEL!
- ) else (
- ctest -j 2 -C %CONFIGURATION% || exit /b !ERRORLEVEL!
- )
-)
-if "%CONFIGURATION%"=="Release" (
- ctest -j 2 -C %CONFIGURATION% || exit /b !ERRORLEVEL!
-)
diff --git a/tools/misc/coverage-helper.cpp b/tools/misc/coverage-helper.cpp
deleted file mode 100644
index 9e7a8ca4..00000000
--- a/tools/misc/coverage-helper.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-#include <algorithm>
-#include <array>
-#include <cassert>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <numeric>
-#include <regex>
-#include <string>
-#include <vector>
-
-std::string escape_arg(const std::string& arg) {
- if (arg.empty() == false &&
- arg.find_first_of(" \t\n\v\"") == arg.npos) {
- return arg;
- }
-
- std::string escaped;
- escaped.push_back('"');
- for (auto it = arg.begin(); ; ++it) {
- int num_backslashes = 0;
-
- while (it != arg.end() && *it == '\\') {
- ++it;
- ++num_backslashes;
- }
-
- if (it == arg.end()) {
- escaped.append(num_backslashes * 2, '\\');
- break;
- } else if (*it == '"') {
- escaped.append((num_backslashes + 1) * 2, '\\');
- escaped.push_back('"');
- escaped.push_back(*it);
- } else {
- escaped.append(num_backslashes, '\\');
- escaped.push_back(*it);
- }
- }
- escaped.push_back('"');
-
- return escaped;
-}
-
-
-void create_empty_file(std::string const& path) {
- std::ofstream ofs(path);
- ofs << '\n';
-}
-
-const std::string separator = "--sep--";
-const std::string logfile_prefix = "--log-file=";
-
-bool starts_with(std::string const& str, std::string const& pref) {
- return str.find(pref) == 0;
-}
-
-int parse_log_file_arg(std::string const& arg) {
- assert(starts_with(arg, logfile_prefix) && "Attempting to parse incorrect arg!");
- auto fname = arg.substr(logfile_prefix.size());
- create_empty_file(fname);
- std::regex regex("MemoryChecker\\.(\\d+)\\.log", std::regex::icase);
- std::smatch match;
- if (std::regex_search(fname, match, regex)) {
- return std::stoi(match[1]);
- } else {
- throw std::domain_error("Couldn't find desired expression in string: " + fname);
- }
-}
-
-std::string catch_path(std::string path) {
- auto start = path.find("catch");
- // try capitalized instead
- if (start == std::string::npos) {
- start = path.find("Catch");
- }
- if (start == std::string::npos) {
- throw std::domain_error("Couldn't find Catch's base path");
- }
- auto end = path.find_first_of("\\/", start);
- return path.substr(0, end);
-}
-
-std::string windowsify_path(std::string path) {
- for (auto& c : path) {
- if (c == '/') {
- c = '\\';
- }
- }
- return path;
-}
-
-int exec_cmd(std::string const& cmd, int log_num, std::string const& path) {
- std::array<char, 128> buffer;
-
- // cmd has already been escaped outside this function.
- auto real_cmd = "OpenCppCoverage --export_type binary:cov-report" + std::to_string(log_num)
- + ".bin --quiet " + "--sources " + escape_arg(path) + "\\src" + " --cover_children -- " + cmd;
- std::cout << "=== Marker ===: Cmd: " << real_cmd << '\n';
- auto pipe = _popen(real_cmd.c_str(), "r");
-
- if (!pipe) {
- throw std::runtime_error("popen() failed!");
- }
- while (!feof(pipe)) {
- if (fgets(buffer.data(), 128, pipe) != nullptr) {
- std::cout << buffer.data();
- }
- }
-
- auto ret = _pclose(pipe);
- if (ret == -1) {
- throw std::runtime_error("underlying error in pclose()");
- }
-
- return ret;
-}
-
-// argv should be:
-// [0]: our path
-// [1]: "--log-file=<path>"
-// [2]: "--sep--"
-// [3]+: the actual command
-
-int main(int argc, char** argv) {
- std::vector<std::string> args(argv, argv + argc);
- auto sep = std::find(begin(args), end(args), separator);
- assert(sep - begin(args) == 2 && "Structure differs from expected!");
-
- auto num = parse_log_file_arg(args[1]);
-
- auto cmdline = std::accumulate(++sep, end(args), std::string{}, [] (const std::string& lhs, const std::string& rhs) {
- return lhs + ' ' + escape_arg(rhs);
- });
-
- try {
- return exec_cmd(cmdline, num, windowsify_path(catch_path(args[0])));
- } catch (std::exception const& ex) {
- std::cerr << "Helper failed with: '" << ex.what() << "'\n";
- return 12;
- }
-}
diff --git a/tools/misc/installOpenCppCoverage.ps1 b/tools/misc/installOpenCppCoverage.ps1
deleted file mode 100644
index 795b7c8e..00000000
--- a/tools/misc/installOpenCppCoverage.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-# Downloads are done from the official github release page links
-$downloadUrl = "https://github.com/OpenCppCoverage/OpenCppCoverage/releases/download/release-0.9.9.0/OpenCppCoverageSetup-x64-0.9.9.0.exe"
-$installerPath = [System.IO.Path]::Combine($Env:USERPROFILE, "Downloads", "OpenCppCoverageSetup.exe")
-
-if(-Not (Test-Path $installerPath)) {
- Write-Host -ForegroundColor White ("Downloading OpenCppCoverage from: " + $downloadUrl)
- Start-BitsTransfer $downloadUrl -Destination $installerPath
-}
-
-Write-Host -ForegroundColor White "About to install OpenCppCoverage..."
-
-$installProcess = (Start-Process $installerPath -ArgumentList '/VERYSILENT' -PassThru -Wait)
-if($installProcess.ExitCode -ne 0) {
- throw [System.String]::Format("Failed to install OpenCppCoverage, ExitCode: {0}.", $installProcess.ExitCode)
-}
-
-# Assume standard, boring, installation path of ".../Program Files/OpenCppCoverage"
-$installPath = [System.IO.Path]::Combine(${Env:ProgramFiles}, "OpenCppCoverage")
-$env:Path="$env:Path;$installPath"