From patchwork Thu Oct 19 15:21:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 13429378 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29C5D2FE39 for ; Thu, 19 Oct 2023 15:27:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TqL5SYrj" Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED25D121 for ; Thu, 19 Oct 2023 08:27:48 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2b9338e4695so110792911fa.2 for ; Thu, 19 Oct 2023 08:27:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697729267; x=1698334067; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=cRAAkzVjtemOySe9QFyPyi5ja34gIGDYBP3y6JanAeY=; b=TqL5SYrj5c6eDFDS1KpX6VoaMvQ0lveXT26kWUfyreQReKpQReGAvlulhUteDvPt9/ kAxI36L0ZA8Rz9UmsXpJHrl9q/wgetqc5bL5fbn0rluTnlQwVjjxzo/wAGUNU9B/uycA pQI6fIrGwa+zzN5PwsSelfLD+kqdMAH03qb6XFLRJnQtvALUKyQzAtM8f+EKSpjFe64l nAXp1IDY9ug4i+3xrOu00b1/DR5BtO/OWEcy89foMeNomx00xNTfztqiSZ5ybLDwuUsN yBmsjOKJuBgkh7C8L2C3aThUDjTiI2uaiGrKgneShW/DZe8fC8Q230Fn1U8h2H2Jmd/+ hPqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697729267; x=1698334067; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=cRAAkzVjtemOySe9QFyPyi5ja34gIGDYBP3y6JanAeY=; b=Mr0WRDAJfKCxpIFabCtyGGaRI/r1M7m9K5oPsb02hm81Osh7F5Irm2EPz49E18NenT tuEsajWH4HVFxfKPBJTpQLYhQS1+MjaNgUAAeYZKslBMx8sFSLDtFzSOlUYMlWq/GaAL QyVa4RxH+1F4rXJni1B9I3On9p+ezOa6kC/StlTL8FJ2kxoQb04wpBuJpSb0hLLjJpxx 9+w4OtJcYW/hCAUaGj5qnZu5J/QfJuCMJb4Z4+btu+7pMuy++JZ2cuFekntLkNGIBUd7 tZD/wMCXU5zVna9dP4AxdrKsNoUdrYzyf6jEKFqnmHS+fFZa8m3+tDKLDrv/wViqE//0 VQdg== X-Gm-Message-State: AOJu0YxNeMU4qeS4WUXtV8QS/o8+dEDjNjRW2PbzoRg5Hv0JX1t+ns2l VrIM8ieNz8gu8wTdkWZ31dk= X-Google-Smtp-Source: AGHT+IG7Rg/6Jw1oRW/A5J74SE68t2gCXaNABBVOVYTjr6e+pRIKDGM8rVNqkF8EYeUV5vf+anwALA== X-Received: by 2002:a2e:3213:0:b0:2c5:380:2a10 with SMTP id y19-20020a2e3213000000b002c503802a10mr1596349ljy.25.1697729266707; Thu, 19 Oct 2023 08:27:46 -0700 (PDT) Received: from localhost.localdomain (host-2-102-115-95.as13285.net. [2.102.115.95]) by smtp.gmail.com with ESMTPSA id j7-20020a05600c190700b0040641a9d49bsm1022117wmq.17.2023.10.19.08.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 08:27:46 -0700 (PDT) From: Phillip Wood To: gitster@pobox.com Cc: calvinwan@google.com, git@vger.kernel.org, johannes.schindelin@gmx.de, linusa@google.com, phillip.wood123@gmail.com, rsbecker@nexbridge.com, steadmon@google.com Subject: [PATCH 1/3] fixup! cmake: also build unit tests Date: Thu, 19 Oct 2023 16:21:49 +0100 Message-ID: <20231019152726.14624-2-phillip.wood123@gmail.com> X-Mailer: git-send-email 2.42.0.506.g0dd4464cfd3 In-Reply-To: <20231019152726.14624-1-phillip.wood123@gmail.com> References: <20231019152726.14624-1-phillip.wood123@gmail.com> Reply-To: Phillip Wood Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Phillip Wood --- contrib/buildsystems/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index d21835ca65..20f38e94c9 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -973,12 +973,12 @@ foreach(unit_test ${unit_test_PROGRAMS}) add_executable("${unit_test}" "${CMAKE_SOURCE_DIR}/t/unit-tests/${unit_test}.c") target_link_libraries("${unit_test}" unit-test-lib common-main) set_target_properties("${unit_test}" - PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests) + PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin) if(MSVC) set_target_properties("${unit_test}" - PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/t/unit-tests) + PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/t/unit-tests/bin) set_target_properties("${unit_test}" - PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/t/unit-tests) + PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/t/unit-tests/bin) endif() list(APPEND PROGRAMS_BUILT "${unit_test}") From patchwork Thu Oct 19 15:21:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 13429380 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D4A92FE3A for ; Thu, 19 Oct 2023 15:27:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SixJ+zSL" Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7950912D for ; Thu, 19 Oct 2023 08:27:49 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4083f61322fso14498815e9.1 for ; Thu, 19 Oct 2023 08:27:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697729268; x=1698334068; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=3kimNNYWoqBwfTCPtYxbhkrkDRujBhE+wKsXyBleEaI=; b=SixJ+zSLdn0akl0L89EyhNUfZslxdka90+2OXogdGqUXILs54J4AlmMy1QUgbpZD7w kMlrxcbfePwq1bYb9rb2rrI+hDbgDxXgcPCjci6U0mjN0Sc7ZdurydDdlMLW01n1IOuI DD4ghMNrQv9iQ3mDw+Xi+qAstHtknTdBJ6rXCSwtAZT7ZSFodB3OgoI5X7OiQkMtM9HD +0l9DJ5+ecNp4w4cXLCr674Fr7dWJaOXCS5CjFSTGnRriQAr3S5OPruNMv8TT99O2W7j e6nkCWexNdxpdcDpalpAQtkpPSpX+LWkAY0IO8ffoKDe1B9sqtTTEui0LRlN4qBtPHPn ba6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697729268; x=1698334068; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3kimNNYWoqBwfTCPtYxbhkrkDRujBhE+wKsXyBleEaI=; b=HiqrBSbcozo8+OgSBx+GshG0ON6/ruC5UBmdLsphtr/xfnvuIdwvsD6zttbV3nmzEc t8wTR0uS6s7EvYhIbeHTZYIeJrLjnAjc+JjeiOIGlJPS0DDKnZNtIFEztdZDOPoroZZs a/MdYeXLkbw7C03JaTezAli/mo0IFMtauzoTXDnMKLGFsIndCjM68DpzUffM8ieTYBO+ vXTjImChZvX930KTsM3rV+amAOD9y0qs3k0EluDfMCxP6hZCIWWd+e3rd2Cd48B9WCic VSzsF0JfrnoejUGwwlmDlYhq1CeN664GXbXbLPUY1c0GVG0vS0F77eJS8exFIT8d1Ydu Au4A== X-Gm-Message-State: AOJu0Ywvg/fqpTCgspapQUOjxYHw9d7tltTo4FF1c+ieuWJicqG2vG09 u/M0MRmwWAH22HircjZtm4E= X-Google-Smtp-Source: AGHT+IGVXoYuq2PvDOG1o3iDOy4lOFfw/xwhfinOmWvYzzfvqVCfXs06s/7YAanF9jtq6nY8ylbc5A== X-Received: by 2002:a05:600c:5122:b0:408:3bbd:4a82 with SMTP id o34-20020a05600c512200b004083bbd4a82mr2199057wms.15.1697729267527; Thu, 19 Oct 2023 08:27:47 -0700 (PDT) Received: from localhost.localdomain (host-2-102-115-95.as13285.net. [2.102.115.95]) by smtp.gmail.com with ESMTPSA id j7-20020a05600c190700b0040641a9d49bsm1022117wmq.17.2023.10.19.08.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 08:27:47 -0700 (PDT) From: Phillip Wood To: gitster@pobox.com Cc: calvinwan@google.com, git@vger.kernel.org, johannes.schindelin@gmx.de, linusa@google.com, phillip.wood123@gmail.com, rsbecker@nexbridge.com, steadmon@google.com Subject: [PATCH 2/3] fixup! artifacts-tar: when including `.dll` files, don't forget the unit-tests Date: Thu, 19 Oct 2023 16:21:50 +0100 Message-ID: <20231019152726.14624-3-phillip.wood123@gmail.com> X-Mailer: git-send-email 2.42.0.506.g0dd4464cfd3 In-Reply-To: <20231019152726.14624-1-phillip.wood123@gmail.com> References: <20231019152726.14624-1-phillip.wood123@gmail.com> Reply-To: Phillip Wood Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Phillip Wood --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 075d8e4899..e15c34e506 100644 --- a/Makefile +++ b/Makefile @@ -3597,7 +3597,7 @@ rpm:: .PHONY: rpm ifneq ($(INCLUDE_DLLS_IN_ARTIFACTS),) -OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll t/unit-tests/*.dll) +OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll t/unit-tests/bin/*.dll) endif artifacts-tar:: $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) $(OTHER_PROGRAMS) \ From patchwork Thu Oct 19 15:21:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 13429381 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C55992FE3D for ; Thu, 19 Oct 2023 15:27:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nsZTOQos" Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25BEA130 for ; Thu, 19 Oct 2023 08:27:50 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4084de32db5so2450515e9.0 for ; Thu, 19 Oct 2023 08:27:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697729268; x=1698334068; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=q0g6XUu7BBsvfvI+Q5EGVnH3kq7sIQyrk8mZhz7t3HI=; b=nsZTOQosLqxGBpBbhjXb7ijYolS+5WDxa5uLN+8rvSguRQF/Jgvgij89Fcp5l5sUBk EU7QFhQnPN2V8JCiMIYW4zki1d1ZG7ZYCH8qzshAov0KZ28O1zfEPmZ2uM1HqCOR+twf YflYj6pjNr7l6A8E2E/gdVb1Yq2f5USJ2ss3b8LUGp8lsNF/AXx3GTiBIXdysL3ljf+c T2bpdpsmC9bmPT/fmzOa4OzLrb2Dmvgub3eLRHE7ZsmzdL/Ott6lAYw9ZGzM9pv/kKwG yz7HDHZs4qwHOxkl0NngOLWb2yN5GgE+vMNEeeyhwj1KB9VyG9vw9xe+Ojxq7xQjxkTc Fg2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697729268; x=1698334068; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=q0g6XUu7BBsvfvI+Q5EGVnH3kq7sIQyrk8mZhz7t3HI=; b=Mw4HV9Sy1Cfu5RpjCzRoJwS5OSkanbigAqwXFnuSJniduB4K6ng30K4+iGls+AUf5U rkq6CZJK2NjoY9Rh0cdi7kK9f9RAS5gXA5owDTyUOGakj88o5PPdPHZcv+w7BCc75jE7 9clK5jb/kcIOQ9erONQAtmH2BWhbNmSh2hGltV4QiFaanMKs/0Mip1OceKeIEr749GbE I9NnsFB3/HEYkgRIx+TT85JibLnWWJ0KC8Irv1rUCAhBQq5nmLqXW+6HixWuHHVED2aT 3zC/TeP8txhq+Q5iAE7PoHnpPFH6q5yHb1eiTfqfSdsPNhB1sGJxjhG/0K3ojt93073U SK1w== X-Gm-Message-State: AOJu0YyE4vnmH24OILyPfK3DaJnogLE007FAfLpLOuonuWOFvfNgWgkc kwcNKCYzvHnDCfJ4ErTXPgU= X-Google-Smtp-Source: AGHT+IGaDGqEuO6ct9I+qiWkw9jcn+uaKe41rsynySO2icCCZ7YsFhpNpEfXJ0Te8VMcpQL+kVnfxg== X-Received: by 2002:a05:600c:154b:b0:407:5b54:bb15 with SMTP id f11-20020a05600c154b00b004075b54bb15mr2076134wmg.36.1697729268223; Thu, 19 Oct 2023 08:27:48 -0700 (PDT) Received: from localhost.localdomain (host-2-102-115-95.as13285.net. [2.102.115.95]) by smtp.gmail.com with ESMTPSA id j7-20020a05600c190700b0040641a9d49bsm1022117wmq.17.2023.10.19.08.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 08:27:48 -0700 (PDT) From: Phillip Wood To: gitster@pobox.com Cc: calvinwan@google.com, git@vger.kernel.org, johannes.schindelin@gmx.de, linusa@google.com, phillip.wood123@gmail.com, rsbecker@nexbridge.com, steadmon@google.com Subject: [PATCH 3/3] fixup! cmake: handle also unit tests Date: Thu, 19 Oct 2023 16:21:51 +0100 Message-ID: <20231019152726.14624-4-phillip.wood123@gmail.com> X-Mailer: git-send-email 2.42.0.506.g0dd4464cfd3 In-Reply-To: <20231019152726.14624-1-phillip.wood123@gmail.com> References: <20231019152726.14624-1-phillip.wood123@gmail.com> Reply-To: Phillip Wood Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Phillip Wood --- contrib/buildsystems/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 20f38e94c9..671c7ead75 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -990,7 +990,7 @@ foreach(unit_test ${unit_test_PROGRAMS}) if(NOT ${unit_test} STREQUAL "t-basic") add_test(NAME "t.unit-tests.${unit_test}" COMMAND "./${unit_test}" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/t/unit-tests) + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/t/unit-tests/bin) endif() endforeach()