diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-02 14:29:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-03-02 14:47:02 (GMT) |
| commit | 1613d87dee2a6779a5c4b70bd1b06019e77e469d (patch) | |
| tree | d28b4fd83e6caa8cff8a5e523ab5ac3cb1820bc4 | |
| parent | ac37e99453f21b57fcd09cc037a7925a7bc017f3 (diff) | |
| download | CMake-1613d87dee2a6779a5c4b70bd1b06019e77e469d.zip CMake-1613d87dee2a6779a5c4b70bd1b06019e77e469d.tar.gz CMake-1613d87dee2a6779a5c4b70bd1b06019e77e469d.tar.bz2 | |
ci: Rename ctest_test_external.cmake to ctest_standalone.cmake
The script is a standalone ctest script that runs all steps.
It can be used for more than just external tests.
| -rw-r--r-- | .gitlab/ci/ctest_standalone.cmake (renamed from .gitlab/ci/ctest_test_external.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 4 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 2 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 14 |
4 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab/ci/ctest_test_external.cmake b/.gitlab/ci/ctest_standalone.cmake index 48e910b..48e910b 100644 --- a/.gitlab/ci/ctest_test_external.cmake +++ b/.gitlab/ci/ctest_standalone.cmake diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 07aa624..482ca7d 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -440,7 +440,7 @@ - .gitlab/ci/sccache.sh - sccache --start-server - sccache --show-stats - - "$LAUNCHER build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake" + - "$LAUNCHER build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake" - sccache --show-stats interruptible: true @@ -453,7 +453,7 @@ - .gitlab/ci/sccache.sh - sccache --start-server - sccache --show-stats - - "$LAUNCHER build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake" + - "$LAUNCHER build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake" - sccache --show-stats interruptible: true diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 79e2e25..e89dba8 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -182,7 +182,7 @@ # Allow the server to already be running. - "sccache --start-server || :" - sccache --show-stats - - "$LAUNCHER build/install/CMake.app/Contents/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake" + - "$LAUNCHER build/install/CMake.app/Contents/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake" - sccache --show-stats interruptible: true diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index d01c828..411baa5 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -250,7 +250,7 @@ stage: test-ext script: - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake + - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true @@ -259,7 +259,7 @@ script: - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake + - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true @@ -271,7 +271,7 @@ - $pwdpath = $pwd.Path - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\jom;$env:PATH" - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake + - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true @@ -282,7 +282,7 @@ - Invoke-Expression -Command .gitlab/ci/borland.ps1 - $pwdpath = $pwd.Path - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\bcc\bin;$env:PATH" - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake + - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true @@ -296,7 +296,7 @@ - Invoke-Expression -Command .gitlab/ci/clang.ps1 - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\llvm\bin;$env:PATH" - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake + - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true @@ -306,7 +306,7 @@ script: - Invoke-Expression -Command .gitlab/ci/msvc.ps1 - Invoke-Expression -Command .gitlab/ci/vcvarsall.ps1 - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake + - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true @@ -321,6 +321,6 @@ - Set-Item -Force -Path "env:EDPATH" -Value "$pwdpath\.gitlab\watcom\eddat" - Set-Item -Force -Path "env:WATCOM" -Value "$pwdpath\.gitlab\watcom" - Set-Item -Force -Path "env:WLINKTMP" -Value "." - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake + - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true |