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

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-12-06 11:40:53 +0100
committerMartin Hořeňovský2019-12-06 11:40:53 +0100
commit6eb04667ad4f571f20b040c5e7a4e0c25e99787c (patch)
treec8709fc63d79e3c43a2f1c9309fde39732f6bc58
parent604ededf7765fd0521a97b35f496af4996c52368 (diff)
downloadcatch3-6eb04667ad4f571f20b040c5e7a4e0c25e99787c.tar.gz
Move misc/ to tools/misc
-rw-r--r--appveyor.yml2
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tools/misc/CMakeLists.txt (renamed from misc/CMakeLists.txt)0
-rw-r--r--tools/misc/SelfTest.vcxproj.user (renamed from misc/SelfTest.vcxproj.user)0
-rw-r--r--tools/misc/appveyorBuildConfigurationScript.bat (renamed from misc/appveyorBuildConfigurationScript.bat)2
-rw-r--r--tools/misc/appveyorMergeCoverageScript.py (renamed from misc/appveyorMergeCoverageScript.py)0
-rw-r--r--tools/misc/appveyorTestRunScript.bat (renamed from misc/appveyorTestRunScript.bat)2
-rw-r--r--tools/misc/coverage-helper.cpp (renamed from misc/coverage-helper.cpp)0
-rw-r--r--tools/misc/installOpenCppCoverage.ps1 (renamed from misc/installOpenCppCoverage.ps1)0
9 files changed, 4 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 3b190566..485732a9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,7 +18,7 @@ init:
install:
- ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { pip --disable-pip-version-check install codecov }
- - ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { .\misc\installOpenCppCoverage.ps1 }
+ - ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { .\tools\misc\installOpenCppCoverage.ps1 }
before_build:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a66b009c..9708fb0d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ include(MiscFunctions)
# until 3.13 (not yet released)
####
if (MSVC)
-configure_file(${CATCH_DIR}/misc/SelfTest.vcxproj.user
+configure_file(${CATCH_DIR}/tools/misc/SelfTest.vcxproj.user
${CMAKE_BINARY_DIR}/tests
COPYONLY)
endif(MSVC) #Temporary workaround
diff --git a/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index bf80846c..bf80846c 100644
--- a/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
diff --git a/misc/SelfTest.vcxproj.user b/tools/misc/SelfTest.vcxproj.user
index ffffc575..ffffc575 100644
--- a/misc/SelfTest.vcxproj.user
+++ b/tools/misc/SelfTest.vcxproj.user
diff --git a/misc/appveyorBuildConfigurationScript.bat b/tools/misc/appveyorBuildConfigurationScript.bat
index f07bb707..5933da38 100644
--- a/misc/appveyorBuildConfigurationScript.bat
+++ b/tools/misc/appveyorBuildConfigurationScript.bat
@@ -8,7 +8,7 @@ SETLOCAL EnableDelayedExpansion
if "%CONFIGURATION%"=="Debug" (
if "%coverage%"=="1" (
@REM # coverage needs to build the special helper as well as the main
- cmake -Hmisc -Bbuild-misc -A%PLATFORM% || exit /b !ERRORLEVEL!
+ cmake -Htools/misc -Bbuild-misc -A%PLATFORM% || exit /b !ERRORLEVEL!
cmake --build build-misc || exit /b !ERRORLEVEL!
cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain% -DMEMORYCHECK_COMMAND=build-misc\Debug\CoverageHelper.exe -DMEMORYCHECK_COMMAND_OPTIONS=--sep-- -DMEMORYCHECK_TYPE=Valgrind || exit /b !ERRORLEVEL! || exit /b !ERRORLEVEL!
) else (
diff --git a/misc/appveyorMergeCoverageScript.py b/tools/misc/appveyorMergeCoverageScript.py
index 93a47fff..93a47fff 100644
--- a/misc/appveyorMergeCoverageScript.py
+++ b/tools/misc/appveyorMergeCoverageScript.py
diff --git a/misc/appveyorTestRunScript.bat b/tools/misc/appveyorTestRunScript.bat
index c129d99e..c491d507 100644
--- a/misc/appveyorTestRunScript.bat
+++ b/tools/misc/appveyorTestRunScript.bat
@@ -4,7 +4,7 @@ cd Build
if "%CONFIGURATION%"=="Debug" (
if "%coverage%"=="1" (
ctest -j 2 -C %CONFIGURATION% -D ExperimentalMemCheck || exit /b !ERRORLEVEL!
- python ..\misc\appveyorMergeCoverageScript.py || 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!
diff --git a/misc/coverage-helper.cpp b/tools/misc/coverage-helper.cpp
index a31e927f..a31e927f 100644
--- a/misc/coverage-helper.cpp
+++ b/tools/misc/coverage-helper.cpp
diff --git a/misc/installOpenCppCoverage.ps1 b/tools/misc/installOpenCppCoverage.ps1
index d277a55d..d277a55d 100644
--- a/misc/installOpenCppCoverage.ps1
+++ b/tools/misc/installOpenCppCoverage.ps1