[3/6] cmake: increase test timeout on Windows only

Message ID	patch-3.6-2b5a9d2c628-20221219T183623Z-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 3/6] cmake: increase test timeout on Windows only Date: Mon, 19 Dec 2022 19:39:21 +0100 Message-Id: <patch-3.6-2b5a9d2c628-20221219T183623Z-avarab@gmail.com> In-Reply-To: <cover-0.6-00000000000-20221219T183623Z-avarab@gmail.com> References: <cover-0.6-00000000000-20221219T183623Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	cmake: guard OS-specific code & cleanup & chmod +x on nix \| expand [0/6] cmake: guard OS-specific code & cleanup & chmod +x on nix [1/6] cmake: don't copy chainlint.pl to build directory [2/6] cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh [3/6] cmake: increase test timeout on Windows only [4/6] cmake: only look for "sh" in "C:/Program Files" on Windows [5/6] cmake: copy over git-p4.py for t983[56] perforce test [6/6] cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4

Message ID

patch-3.6-2b5a9d2c628-20221219T183623Z-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 3/6] cmake: increase test timeout on Windows only
Date: Mon, 19 Dec 2022 19:39:21 +0100
Message-Id: <patch-3.6-2b5a9d2c628-20221219T183623Z-avarab@gmail.com>
In-Reply-To: <cover-0.6-00000000000-20221219T183623Z-avarab@gmail.com>
References: <cover-0.6-00000000000-20221219T183623Z-avarab@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

cmake: guard OS-specific code & cleanup & chmod +x on *nix | expand

Commit Message

Ævar Arnfjörð Bjarmason Dec. 19, 2022, 6:39 p.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 040f5f31230..d45b9c8e00a 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -1125,8 +1125,10 @@  foreach(tsh ${test_scipts})
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/t)
 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

[3/6] cmake: increase test timeout on Windows only

Commit Message

Patch