[v6,12/15] cmake: increase test timeout on Windows only

Message ID	patch-v6-12.15-4905ce5321d-20221206T001617Z-avarab@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Johannes Schindelin <Johannes.Schindelin@gmx.de>, Phillip Wood <phillip.wood123@gmail.com>, Victoria Dye <vdye@github.com>, Eric Sunshine <ericsunshine@gmail.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= <avarab@gmail.com> Subject: [PATCH v6 12/15] cmake: increase test timeout on Windows only Date: Tue, 6 Dec 2022 03:09:10 +0100 Message-Id: <patch-v6-12.15-4905ce5321d-20221206T001617Z-avarab@gmail.com> In-Reply-To: <cover-v6-00.15-00000000000-20221206T001617Z-avarab@gmail.com> References: <cover-v5-00.15-00000000000-20221202T110947Z-avarab@gmail.com> <cover-v6-00.15-00000000000-20221206T001617Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	cmake: document, fix on nix, add CI \| expand [v6,00/15] cmake: document, fix on nix, add CI [v6,01/15] cmake: don't invoke msgfmt with --statistics [v6,02/15] cmake: use "-S" and "-B" to specify source and build directories [v6,03/15] cmake: update instructions for portable CMakeLists.txt [v6,04/15] cmake: don't copy chainlint.pl to build directory [v6,05/15] cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4 [v6,06/15] cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable [v6,07/15] cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh [v6,08/15] Makefile + test-lib.sh: don't prefer cmake-built to make-built git [v6,09/15] test-lib.sh: support a "GIT_TEST_BUILD_DIR" [v6,10/15] cmake: optionally be able to run tests before "ctest" [v6,11/15] cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults [v6,12/15] cmake: increase test timeout on Windows only [v6,13/15] cmake: only look for "sh" in "C:/Program Files" on Windows [v6,14/15] cmake: copy over git-p4.py for t983[56] perforce test [v6,15/15] CI: add a "linux-cmake-test" to run cmake & ctest on linux

Message ID

patch-v6-12.15-4905ce5321d-20221206T001617Z-avarab@gmail.com (mailing list archive)

State

New, archived

Headers

From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?=  <avarab@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
 Johannes Schindelin <Johannes.Schindelin@gmx.de>,
 Phillip Wood <phillip.wood123@gmail.com>, Victoria Dye <vdye@github.com>,
 Eric Sunshine <ericsunshine@gmail.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?=
	=?utf-8?b?amFybWFzb24=?=  <avarab@gmail.com>
Subject: [PATCH v6 12/15] cmake: increase test timeout on Windows only
Date: Tue,  6 Dec 2022 03:09:10 +0100
Message-Id: <patch-v6-12.15-4905ce5321d-20221206T001617Z-avarab@gmail.com>
In-Reply-To: <cover-v6-00.15-00000000000-20221206T001617Z-avarab@gmail.com>
References: <cover-v5-00.15-00000000000-20221202T110947Z-avarab@gmail.com>
 <cover-v6-00.15-00000000000-20221206T001617Z-avarab@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

cmake: document, fix on *nix, add CI | expand

Commit Message

Ævar Arnfjörð Bjarmason Dec. 6, 2022, 2:09 a.m. UTC

Per c858750b41c (cmake: increase time-out for a long-running test,
2022-10-18) the reason to set a custom timeout for
t7112-reset-submodule.sh is Windows-specific. Let's only do that on
Windows then.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 contrib/buildsystems/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 034ab2c879a..139498c5d5b 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -1206,8 +1206,10 @@  if(NOT GIT_CTEST_SETS_BUILD_DIR)
 endif()
 endforeach()
 
-# This test script takes an extremely long time and is known to time out even
-# on fast machines because it requires in excess of one hour to run
-set_tests_properties("${CMAKE_SOURCE_DIR}/t/t7112-reset-submodule.sh" PROPERTIES TIMEOUT 4000)
+if(WIN32)
+	# This test script takes an extremely long time and is known to time out even
+	# on fast machines because it requires in excess of one hour to run
+	set_tests_properties("${CMAKE_SOURCE_DIR}/t/t7112-reset-submodule.sh" PROPERTIES TIMEOUT 4000)
+endif()
 
 endif()#BUILD_TESTING

[v6,12/15] cmake: increase test timeout on Windows only

Commit Message

Patch