From patchwork Tue Jul 28 23:34:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 11690077 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 549AA14E3 for ; Tue, 28 Jul 2020 23:35:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 302A2207FC for ; Tue, 28 Jul 2020 23:35:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="M5cKEWmu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730239AbgG1XfM (ORCPT ); Tue, 28 Jul 2020 19:35:12 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40926 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730203AbgG1XfJ (ORCPT ); Tue, 28 Jul 2020 19:35:09 -0400 Received: from camp.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:b610:a2f0:36c1:12e3]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id BC0156101E; Tue, 28 Jul 2020 23:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1595979307; bh=kxZYNK6Va1MuOmXfxizmLHhju9aeB8cDRgPk/U5hImM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=M5cKEWmuZBCPjzzVVhVXKKf25PToAmcVOwplUY9djpthXSFccXqHhp5sTHIDvkOPp iYGLVnUggUZd35La6HKP9xBduNwdtxVfPf+QlT45E97uEETlygmtOypm8JdogISSRi pEgd9awkczmGbHeEMWcloo4R38cpyAgYEMgz0P3dqRalyJy0XjJ8geCG70vSSCaCYL urKXnVJQvMJZtXJ1k+/tMGs4ZpPFgRzGxmhO7hVCjy4GpwdUjSB6p77+9Qz538z0qq 35V15pMEidL6upVrzYWkBJgHg78H8lnlSVyaNV9OTlOefC+8XaeawCRyy/C0SCgfvI w9y1Ie7Git2eisRn+x8G2cxf1Ze3t7DoNb7kFPGpsZ3d01ZL7DbTS0iVWH3iqvgWhu qEDWSDuVXDwCgxFh5MflqzBfPicxcFO1HdemQ6CUpb0dCKZF6f2mIPt+qB+eUNjQzH tM7Dvt8jH5kmhX3X1sPHH1Quh9LXKJhf9zDWnILVl+S+YpWDHIb From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v5 26/39] t9700: make hash size independent Date: Tue, 28 Jul 2020 23:34:33 +0000 Message-Id: <20200728233446.3066485-27-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6 In-Reply-To: <20200728233446.3066485-1-sandals@crustytoothpaste.net> References: <20200728233446.3066485-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The Perl test script for t9700 was matching on exactly 40 hex characters. With SHA-256, we'll have 64 hex-character object IDs. Create a variable with a regex which matches exactly 40 or 64 hex characters and use that to match the output. Note that both of the uses of this can be anchored, which makes the code simpler, so do that as well. Signed-off-by: brian m. carlson --- t/t9700/test.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t9700/test.pl b/t/t9700/test.pl index 34cd01366f..071ff6d82a 100755 --- a/t/t9700/test.pl +++ b/t/t9700/test.pl @@ -23,6 +23,8 @@ sub adjust_dirsep { return $path; } +my $oid_re = qr/^[0-9a-fA-F]{40}(?:[0-9a-fA-F]{24})?$/; + BEGIN { use_ok('Git') } # set up @@ -93,7 +95,7 @@ sub adjust_dirsep { open TEMPFILE, ">$tmpfile" or die "Can't open $tmpfile: $!"; print TEMPFILE my $test_text = "test blob, to be inserted\n"; close TEMPFILE or die "Failed writing to $tmpfile: $!"; -like(our $newhash = $r->hash_and_insert_object($tmpfile), qr/[0-9a-fA-F]{40}/, +like(our $newhash = $r->hash_and_insert_object($tmpfile), $oid_re, "hash_and_insert_object: returns hash"); open TEMPFILE, "+>$tmpfile" or die "Can't open $tmpfile: $!"; is($r->cat_blob($newhash, \*TEMPFILE), length $test_text, "cat_blob: roundtrip size"); @@ -119,7 +121,7 @@ sub adjust_dirsep { # commands in sub directory my $last_commit = $r2->command_oneline(qw(rev-parse --verify HEAD)); -like($last_commit, qr/^[0-9a-fA-F]{40}$/, 'rev-parse returned hash'); +like($last_commit, $oid_re, 'rev-parse returned hash'); my $dir_commit = $r2->command_oneline('log', '-n1', '--pretty=format:%H', '.'); isnt($last_commit, $dir_commit, 'log . does not show last commit');