mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-08 15:19:54 +01:00
Move misc/ to tools/misc
This commit is contained in:
parent
604ededf77
commit
6eb04667ad
@ -18,7 +18,7 @@ init:
|
|||||||
|
|
||||||
install:
|
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" ) { 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:
|
before_build:
|
||||||
|
@ -6,7 +6,7 @@ include(MiscFunctions)
|
|||||||
# until 3.13 (not yet released)
|
# until 3.13 (not yet released)
|
||||||
####
|
####
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
configure_file(${CATCH_DIR}/misc/SelfTest.vcxproj.user
|
configure_file(${CATCH_DIR}/tools/misc/SelfTest.vcxproj.user
|
||||||
${CMAKE_BINARY_DIR}/tests
|
${CMAKE_BINARY_DIR}/tests
|
||||||
COPYONLY)
|
COPYONLY)
|
||||||
endif(MSVC) #Temporary workaround
|
endif(MSVC) #Temporary workaround
|
||||||
|
@ -8,7 +8,7 @@ SETLOCAL EnableDelayedExpansion
|
|||||||
if "%CONFIGURATION%"=="Debug" (
|
if "%CONFIGURATION%"=="Debug" (
|
||||||
if "%coverage%"=="1" (
|
if "%coverage%"=="1" (
|
||||||
@REM # coverage needs to build the special helper as well as the main
|
@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 --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!
|
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 (
|
) else (
|
@ -4,7 +4,7 @@ cd Build
|
|||||||
if "%CONFIGURATION%"=="Debug" (
|
if "%CONFIGURATION%"=="Debug" (
|
||||||
if "%coverage%"=="1" (
|
if "%coverage%"=="1" (
|
||||||
ctest -j 2 -C %CONFIGURATION% -D ExperimentalMemCheck || exit /b !ERRORLEVEL!
|
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!
|
codecov --root .. --no-color --disable gcov -f cobertura.xml -t %CODECOV_TOKEN% || exit /b !ERRORLEVEL!
|
||||||
) else (
|
) else (
|
||||||
ctest -j 2 -C %CONFIGURATION% || exit /b !ERRORLEVEL!
|
ctest -j 2 -C %CONFIGURATION% || exit /b !ERRORLEVEL!
|
Loading…
Reference in New Issue
Block a user