From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id BC6D01F66F for ; Thu, 29 Oct 2020 02:16:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391065AbgJ2CQk (ORCPT ); Wed, 28 Oct 2020 22:16:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388367AbgJ2CQe (ORCPT ); Wed, 28 Oct 2020 22:16:34 -0400 Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA7ABC0613CF for ; Wed, 28 Oct 2020 19:16:33 -0700 (PDT) Received: by mail-qv1-xf2e.google.com with SMTP id 63so766559qva.7 for ; Wed, 28 Oct 2020 19:16:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5lbaPV17AcHOGfhR/neKqPzAHtfoFiFxXZYHRMTvLD8=; b=JyZGBtvx/zcwoEYwgCSW9uRwIDGtxYaSB49C4dk1eXVyPWc/pPzXzP9bDqHTUAu8LF R9v3yIHY9XA24l4BbWNEce/BwP/HqcYg9AQIzhWrj0KdXbJvQY5oOO5sJYHyebLBAys4 1yYZmqLX2GcuH6gj8w9eiqsgnz5j0aYoIMbuvteOo5YarX5Jlxv9kH094NGK3Zsg2sDY WLX14JttYzNJATi73JzfpHET5WIAa4bHQtD0ISfh1IUtkjtYDlvbvltSPsG8M9Mt0M6x JoWFyRB/4gM3beAwNW9g+2xyGzoC6cylRG25VZnV1qoRhXaRdq8RIRyBCO30PsNdobRW qSbQ== 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=5lbaPV17AcHOGfhR/neKqPzAHtfoFiFxXZYHRMTvLD8=; b=qBLPHLhN46TDC61tyDlHoDIIcKYQUO8C5Mf1beYA5x+P6eRpY95Pk3T7cPvPtewWWk 408/vK1122lHx0rhLVGhCmJuLBvu3MoAtKuHNATIIwEssJKnX5TLwK+olbsWjllBy8eh xTNeT4A/T1zBGNQeD/DsdX93rTLtQVUh/4BW/EYdojpgpAjbpeE8TKNeu1e/K0lCWsZ9 jJk3BBvpjzLO2Kqw42KHoy7T+TEdqsnMy2BAbU6n/n5WodqQ/L7CBFVwLWQgaUyKZwqZ DPnIkCao2jmOFxClWshUjKsdCp/u7Rk4n2OsWPs+lr4RVlPkDzXnmia9a+/90LK/zN8S RZpg== X-Gm-Message-State: AOAM533+Lsoqbn7iE7AmtcsXbBzCMoLy34i9pE7/yFZ+AVxeono1eyvE T6EXf81vHLQio1QxcrW9j/eIzYNNbeiKKQ== X-Google-Smtp-Source: ABdhPJz03mh9iwKBnlnbw/uSRaQgLvx3GelwSk15NcKBdVfyEbg/+FhqGdn/WWvKR6KrNivhpjZ31Q== X-Received: by 2002:a0c:f442:: with SMTP id h2mr2374716qvm.55.1603937792532; Wed, 28 Oct 2020 19:16:32 -0700 (PDT) Received: from mango.meuintelbras.local ([177.32.118.149]) by smtp.gmail.com with ESMTPSA id n201sm608371qka.32.2020.10.28.19.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 19:16:31 -0700 (PDT) From: Matheus Tavares To: git@vger.kernel.org Cc: gitster@pobox.com, git@jeffhostetler.com, chriscool@tuxfamily.org, peff@peff.net, newren@gmail.com, jrnieder@gmail.com, martin.agren@gmail.com Subject: [PATCH v3 18/19] parallel-checkout: add tests related to .gitattributes Date: Wed, 28 Oct 2020 23:14:55 -0300 Message-Id: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add tests to confirm that `struct conv_attrs` data is correctly passed from the main process to the workers, and that they properly smudge files before writing to the working tree. Also check that non-parallel-eligible entries, such as regular files that require external filters, are correctly smudge and written when parallel-checkout is enabled. Note: to avoid repeating code, some helper functions are extracted from t0028 into a common lib file. Original-patch-by: Jeff Hostetler Signed-off-by: Jeff Hostetler Signed-off-by: Matheus Tavares --- t/lib-encoding.sh | 25 ++++ t/t0028-working-tree-encoding.sh | 25 +--- t/t2082-parallel-checkout-attributes.sh | 174 ++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 24 deletions(-) create mode 100644 t/lib-encoding.sh create mode 100755 t/t2082-parallel-checkout-attributes.sh diff --git a/t/lib-encoding.sh b/t/lib-encoding.sh new file mode 100644 index 0000000000..c52ffbbed5 --- /dev/null +++ b/t/lib-encoding.sh @@ -0,0 +1,25 @@ +# Encoding helpers used by t0028 and t2082 + +test_lazy_prereq NO_UTF16_BOM ' + test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6 +' + +test_lazy_prereq NO_UTF32_BOM ' + test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12 +' + +write_utf16 () { + if test_have_prereq NO_UTF16_BOM + then + printf '\376\377' + fi && + iconv -f UTF-8 -t UTF-16 +} + +write_utf32 () { + if test_have_prereq NO_UTF32_BOM + then + printf '\0\0\376\377' + fi && + iconv -f UTF-8 -t UTF-32 +} diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh index bfc4fb9af5..4fffc3a639 100755 --- a/t/t0028-working-tree-encoding.sh +++ b/t/t0028-working-tree-encoding.sh @@ -3,33 +3,10 @@ test_description='working-tree-encoding conversion via gitattributes' . ./test-lib.sh +. "$TEST_DIRECTORY/lib-encoding.sh" GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING -test_lazy_prereq NO_UTF16_BOM ' - test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6 -' - -test_lazy_prereq NO_UTF32_BOM ' - test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12 -' - -write_utf16 () { - if test_have_prereq NO_UTF16_BOM - then - printf '\376\377' - fi && - iconv -f UTF-8 -t UTF-16 -} - -write_utf32 () { - if test_have_prereq NO_UTF32_BOM - then - printf '\0\0\376\377' - fi && - iconv -f UTF-8 -t UTF-32 -} - test_expect_success 'setup test files' ' git config core.eol lf && diff --git a/t/t2082-parallel-checkout-attributes.sh b/t/t2082-parallel-checkout-attributes.sh new file mode 100755 index 0000000000..6800574588 --- /dev/null +++ b/t/t2082-parallel-checkout-attributes.sh @@ -0,0 +1,174 @@ +#!/bin/sh + +test_description='parallel-checkout: attributes + +Verify that parallel-checkout correctly creates files that require +conversions, as specified in .gitattributes. The main point here is +to check that the conv_attr data is correctly sent to the workers +and that it contains sufficient information to smudge files +properly (without access to the index or attribute stack). +' + +TEST_NO_CREATE_REPO=1 +. ./test-lib.sh +. "$TEST_DIRECTORY/lib-parallel-checkout.sh" +. "$TEST_DIRECTORY/lib-encoding.sh" + +test_expect_success 'parallel-checkout with ident' ' + git init ident && + ( + cd ident && + echo "A ident" >.gitattributes && + echo "\$Id\$" >A && + echo "\$Id\$" >B && + git add -A && + git commit -m id && + + rm A B && + git_pc 2 0 2 reset --hard && + hexsz=$(test_oid hexsz) && + grep -E "\\\$Id: [0-9a-f]{$hexsz} \\\$" A && + grep "\\\$Id\\\$" B + ) +' + +test_expect_success 'parallel-checkout with re-encoding' ' + git init encoding && + ( + cd encoding && + echo text >utf8-text && + cat utf8-text | write_utf16 >utf16-text && + + echo "A working-tree-encoding=UTF-16" >.gitattributes && + cp utf16-text A && + cp utf16-text B && + git add A B .gitattributes && + git commit -m encoding && + + # Check that A (and only A) is stored in UTF-8 + git cat-file -p :A >A.internal && + test_cmp_bin utf8-text A.internal && + git cat-file -p :B >B.internal && + test_cmp_bin utf16-text B.internal && + + # Check that A is re-encoded during checkout + rm A B && + git_pc 2 0 2 checkout A B && + test_cmp_bin utf16-text A + ) +' + +test_expect_success 'parallel-checkout with eol conversions' ' + git init eol && + ( + cd eol && + git config core.autocrlf false && + printf "multi\r\nline\r\ntext" >crlf-text && + printf "multi\nline\ntext" >lf-text && + + echo "A text eol=crlf" >.gitattributes && + echo "B -text" >>.gitattributes && + cp crlf-text A && + cp crlf-text B && + git add A B .gitattributes && + git commit -m eol && + + # Check that A (and only A) is stored with LF format + git cat-file -p :A >A.internal && + test_cmp_bin lf-text A.internal && + git cat-file -p :B >B.internal && + test_cmp_bin crlf-text B.internal && + + # Check that A is converted to CRLF during checkout + rm A B && + git_pc 2 0 2 checkout A B && + test_cmp_bin crlf-text A + ) +' + +test_cmp_str() +{ + echo "$1" >tmp && + test_cmp tmp "$2" +} + +# Entries that require an external filter are not eligible for parallel +# checkout. Check that both the parallel-eligible and non-eligible entries are +# properly writen in a single checkout process. +# +test_expect_success 'parallel-checkout and external filter' ' + git init filter && + ( + cd filter && + git config filter.x2y.clean "tr x y" && + git config filter.x2y.smudge "tr y x" && + git config filter.x2y.required true && + + echo "A filter=x2y" >.gitattributes && + echo x >A && + echo x >B && + echo x >C && + git add -A && + git commit -m filter && + + # Check that A (and only A) was cleaned + git cat-file -p :A >A.internal && + test_cmp_str y A.internal && + git cat-file -p :B >B.internal && + test_cmp_str x B.internal && + git cat-file -p :C >C.internal && + test_cmp_str x C.internal && + + rm A B C *.internal && + git_pc 2 0 2 checkout A B C && + test_cmp_str x A && + test_cmp_str x B && + test_cmp_str x C + ) +' + +# The delayed queue is independent from the parallel queue, and they should be +# able to work together in the same checkout process. +# +test_expect_success PERL 'parallel-checkout and delayed checkout' ' + write_script rot13-filter.pl "$PERL_PATH" \ + <"$TEST_DIRECTORY"/t0021/rot13-filter.pl && + test_config_global filter.delay.process \ + "\"$(pwd)/rot13-filter.pl\" \"$(pwd)/delayed.log\" clean smudge delay" && + test_config_global filter.delay.required true && + + echo "a b c" >delay-content && + echo "n o p" >delay-rot13-content && + + git init delayed && + ( + cd delayed && + echo "*.a filter=delay" >.gitattributes && + cp ../delay-content test-delay10.a && + cp ../delay-content test-delay11.a && + echo parallel >parallel1.b && + echo parallel >parallel2.b && + git add -A && + git commit -m delayed && + + # Check that the stored data was cleaned + git cat-file -p :test-delay10.a > delay10.internal && + test_cmp delay10.internal ../delay-rot13-content && + git cat-file -p :test-delay11.a > delay11.internal && + test_cmp delay11.internal ../delay-rot13-content && + rm *.internal && + + rm *.a *.b + ) && + + git_pc 2 0 2 -C delayed checkout -f && + verify_checkout delayed && + + # Check that the *.a files got to the delay queue and were filtered + grep "smudge test-delay10.a .* \[DELAYED\]" delayed.log && + grep "smudge test-delay11.a .* \[DELAYED\]" delayed.log && + test_cmp delayed/test-delay10.a delay-content && + test_cmp delayed/test-delay11.a delay-content +' + +test_done -- 2.28.0