From patchwork Fri Sep 6 12:13:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?SZEDER_G=C3=A1bor?= X-Patchwork-Id: 11135155 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 99D7D13B1 for ; Fri, 6 Sep 2019 12:13:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75E4A2082C for ; Fri, 6 Sep 2019 12:13:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZpchtlxL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391824AbfIFMNd (ORCPT ); Fri, 6 Sep 2019 08:13:33 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36983 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727210AbfIFMNd (ORCPT ); Fri, 6 Sep 2019 08:13:33 -0400 Received: by mail-wm1-f67.google.com with SMTP id r195so6849856wme.2 for ; Fri, 06 Sep 2019 05:13:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o05IhCKSBid0C4HYnqqE9+HEemdo/T8LBL11ecee520=; b=ZpchtlxLyDO3jUJ0h1/KBQBMJHqdRcTG8Ag8Tu2ZlIixuoT91ZJ0yNXspmF2/eij4L rYds5RtK4mphOB0g6crDab82XgfXrJ5wV7E6gL+CQQQaMK9F2Q36Y/LPOJh2JXA7h4FX ns+YKmhZrW0GG4QtBajqVt+xFSDGwG30s34/JIio2LSANxVoNLBSzxb1rt96awpiRho/ b7MNZppCQuQwOwh5aXrUHCNC/0W2MA/ofiKy03FfUGZh3jBWuij24RrHiDXYswMisdiq Lug6UlRC5axxCHhT6DNRIaoFsJixrNTtB0Tum0t23UscZX6b+/zcgPgxF+rSMOjXtaAq 5nxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o05IhCKSBid0C4HYnqqE9+HEemdo/T8LBL11ecee520=; b=KGblzZz3gxnrCa9lCGMeuHty9OdoOOR5IYrU5gogeKvx9k7tz3kxPP0SEbhp0RKxv1 pr6zsFD0ml38bjXxrExPsyKpIp5Q5U08r64sPloL1k/dHVjpvqiDlGzNMACeFwuSoct1 wZEG/SNO9BqHyxbwpU4cmguSdFmhRQ5bE9BYVMT3Jf5aRDU5l26rf2kWqzaAFzHimdJ7 LlYQyBhjqzVGc/wiKogiuBARASXKeDHZIwivQNwNRSBmcjrPRbOBzte5PDMX6FMuDiMW 7Upq3sypjvH/OSJ3poQSKLUW872IXqAmRGyGSpNj9lLyGCNSJm5b/Jvggoc+63ElIU/L 4zsw== X-Gm-Message-State: APjAAAXRJQO2rbsW5QlCZIMa+3pCcvaFhrmN+YtR/Be3aUGCbQ/5v5bF xn7E534GWRPW3DjbuEWsNBs= X-Google-Smtp-Source: APXvYqzWrlarrFuMHPQA9IrLHw6rcMEyQLt1NKSAvaGBb9dHYFFQT6wEeIVTWcwDGmi4xn5Mi7sGNw== X-Received: by 2002:a05:600c:285:: with SMTP id 5mr7670128wmk.161.1567772011195; Fri, 06 Sep 2019 05:13:31 -0700 (PDT) Received: from localhost.localdomain (x4db936a8.dyn.telefonica.de. [77.185.54.168]) by smtp.gmail.com with ESMTPSA id e15sm4416826wru.93.2019.09.06.05.13.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Sep 2019 05:13:30 -0700 (PDT) From: =?utf-8?q?SZEDER_G=C3=A1bor?= To: Junio C Hamano Cc: git@vger.kernel.org, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Jeff King , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= , Eric Wong , =?utf-8?q?SZEDER_G=C3=A1bor?= Subject: [PATCH 1/2] t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests Date: Fri, 6 Sep 2019 14:13:25 +0200 Message-Id: <20190906121326.23056-1-szeder.dev@gmail.com> X-Mailer: git-send-email 2.23.0.331.g4e51dcdf11 In-Reply-To: <20190621101812.27300-8-avarab@gmail.com> References: <20190621101812.27300-8-avarab@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Once upon a time the GIT_SVN_TEST_HTTPD environment variable needed to be set to enable SVN HTTP tests [1]. Then 3b072c577b (tests: replace test_tristate with "git env--helper", 2019-06-21) came along, and attempted to turn GIT_SVN_TEST_HTTPD into a bool, but while doing so it mistyped the variable name, and started to check GIT_TEST_HTTPD instead. Consequently, if someone explicitly set GIT_TEST_HTTPD to true and has only the general 'git-svn' dependencies installed but not the Subversion server modules for Apache (libapache2-mod-svn), then a couple of 'git-svn' tests fail, because they can't start httpd due to the missing module. We could simply fix this by checking the GIT_SVN_TEST_HTTPD variablewith 'git env--helper', but notice that the name of this variable doesn't conform to our usual GIT_TEST_* convention. So let's check the GIT_TEST_SVN_HTTPD instead. [1] a8a5d25118 (git svn: migrate tests to use lib-httpd, 2016-07-23) Signed-off-by: SZEDER Gábor --- t/lib-git-svn.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 5d4ae629e1..bc0b9c71f8 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -69,7 +69,7 @@ svn_cmd () { maybe_start_httpd () { loc=${1-svn} - if git env--helper --type=bool --default=false --exit-code GIT_TEST_HTTPD + if git env--helper --type=bool --default=false --exit-code GIT_TEST_SVN_HTTPD then . "$TEST_DIRECTORY"/lib-httpd.sh LIB_HTTPD_SVN="$loc" From patchwork Fri Sep 6 12:13:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?SZEDER_G=C3=A1bor?= X-Patchwork-Id: 11135157 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CBB8F13B1 for ; Fri, 6 Sep 2019 12:13:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABC552082C for ; Fri, 6 Sep 2019 12:13:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GLMZfLUA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391833AbfIFMNe (ORCPT ); Fri, 6 Sep 2019 08:13:34 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:36059 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729790AbfIFMNe (ORCPT ); Fri, 6 Sep 2019 08:13:34 -0400 Received: by mail-wm1-f65.google.com with SMTP id p13so6861987wmh.1 for ; Fri, 06 Sep 2019 05:13:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z0yfZ/1pj0cmtZbv6Nbmw0g6f5GTXrQIbytkFPLLtRI=; b=GLMZfLUAMEVnfDI/9HGNBPqvCEqPkSslKb0k2uLvIj0i03vxTKHepsAACR0ajbCnIJ 5XZ4c0GDukCeZ5t/X1gjhba/FcXlS3fDpZLvyJFx3WwD3uv9ujqQPsAYQ2Zfjg4f0clw 6CohgohKtZhDbFHnFPJNLvMPfJEHHMiRgjJNUVNEuFAAqwzOJL56sfUhiwtC/0UHbMXj tkixa6Wqm9GnS2xSfsn6Mf6DGGRoUQTzGbWdNQxjubZp65AXwwwp+r//hqA7mCPFYOU6 sRb5lucPHzvGMWilyRGFQAQ/FnTupnBlFRpPM7Vwbppp5+EkhKMV5Uf7XrNkiX/+SLig 1Vvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z0yfZ/1pj0cmtZbv6Nbmw0g6f5GTXrQIbytkFPLLtRI=; b=n11JAgxU8H+8QYH2q13kbXVvOcelP5a8z49WyyTBiTze4zLiHmnWPmC7+R2Q0YSuy9 b1CJ9k9O5axNTHzQQiEvDJVwTqIP2uOqqroUEV1ZI5meEZkJJO+8t3QamM+Zu+RhNBxQ cnNcFp7M4WrPVVekrLTg7WFBFz1sa700YZGQK7gqtGDt87jEZjNfzJGLlq9r0Q7mQZcV qgtLmeTwMbECmg2m2rnfE0YRxDU6YwLEcMfNi7gvkRqTW0Pl33WoI9E6Ar47yMWrY0vA 5JO94ls1jqZg/607JrbhC0t1RgAX2Q9EwooYP+eQsHsZ/vjgBE3MzNIXjz6f3XzP9vpf N6XA== X-Gm-Message-State: APjAAAXl+Bc2l6kB9ijKR09LQ6FcT0onDo/Dx9ciQe5XsOKyv+K5DvCz XxnM9b4rwkBqvVDlvg7JErY= X-Google-Smtp-Source: APXvYqwgj9XPuAMoYTkBHc78bdqEb+PC15pykKr5hkcZ4tjhNFsOzyW0C4e8umLvb2LEFJzfZYtnmg== X-Received: by 2002:a7b:cf2b:: with SMTP id m11mr7259613wmg.3.1567772012229; Fri, 06 Sep 2019 05:13:32 -0700 (PDT) Received: from localhost.localdomain (x4db936a8.dyn.telefonica.de. [77.185.54.168]) by smtp.gmail.com with ESMTPSA id e15sm4416826wru.93.2019.09.06.05.13.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Sep 2019 05:13:31 -0700 (PDT) From: =?utf-8?q?SZEDER_G=C3=A1bor?= To: Junio C Hamano Cc: git@vger.kernel.org, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Jeff King , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= , Eric Wong , =?utf-8?q?SZEDER_G=C3=A1bor?= Subject: [PATCH 2/2] ci: restore running httpd tests Date: Fri, 6 Sep 2019 14:13:26 +0200 Message-Id: <20190906121326.23056-2-szeder.dev@gmail.com> X-Mailer: git-send-email 2.23.0.331.g4e51dcdf11 In-Reply-To: <20190906121326.23056-1-szeder.dev@gmail.com> References: <20190621101812.27300-8-avarab@gmail.com> <20190906121326.23056-1-szeder.dev@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Once upon a time GIT_TEST_HTTPD was a tristate variable and we exported 'GIT_TEST_HTTPD=YesPlease' in our CI scripts to make sure that we run the httpd tests in the Linux Clang and GCC build jobs, or error out if they can't be run for any reason [1]. Then 3b072c577b (tests: replace test_tristate with "git env--helper", 2019-06-21) came along, turned GIT_TEST_HTTPD into a bool, but forgot to update our CI scripts accordingly. So, since GIT_TEST_HTTPD is set explicitly, but its value is not one of the standardized true values, our CI jobs have been simply skipping the httpd tests in the last couple of weeks. Set 'GIT_TEST_HTTPD=true' to restore running httpd tests in our CI jobs. [1] a1157b76eb (travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh', 2017-12-12) Signed-off-by: SZEDER Gábor --- ci/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/lib.sh b/ci/lib.sh index 44db2d5cbb..29dc740d40 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -160,7 +160,7 @@ linux-clang|linux-gcc) export CC=gcc-8 fi - export GIT_TEST_HTTPD=YesPlease + export GIT_TEST_HTTPD=true # The Linux build installs the defined dependency versions below. # The OS X build installs much more recent versions, whichever