From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id AFAB93858D38 for ; Mon, 26 Dec 2022 20:47:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AFAB93858D38 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=harmstone.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-x42b.google.com with SMTP id i7so10831880wrv.8 for ; Mon, 26 Dec 2022 12:47:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=ej1Xls1MstXT2FwYDYySu8ATB72kTADoagNybZwQKi8=; b=UOFy/433rsWbuqvVpQrFkwjg61BG+YyTB8RUI0pagBl53A7+EPXm8wLGicOf8uX4IF 8ZBbirYXeRjZPvjoglkyGl7ZIyoPaGCJ50Ls8rlKQBI/dCwugbSlnLdJgFbP8RNMJ8Km iYM0RZrvepdJerqTKsO3SAA/v+/7Ujy7ahrNqz1tamct/td/FA0se4RHiw/2xvmuzyHp Hn/QNyHxZ6hvbq8ivzcJagz7pTEQqH3sjMQJlrQrKS4V9Oe5ejKrXpUErugbAsmmilhL MEfNbThhpxFExgTeij3VRl2pcFaW6EbIx63rI6c+W0CoRUFS1AgCRmZQsRC3yrffxklx Brlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ej1Xls1MstXT2FwYDYySu8ATB72kTADoagNybZwQKi8=; b=L6Gm5xXZnl4DS8K5RKRcy10jYunDjfA3Uw9fNuMp1OEn1kZ+ZFsJUetG8WMsFHMv43 HMVbveKmWrKLK/5o1oo4bC5L6/wfb2SZNGuS7mm9EcBohdgB3AcmUjt98cOGaQiQ37J7 qoEpGJ49QvQuuBS1dLNX8k6O4X3MdQUoY89T9kvq0Lx25S/rCFE5eLVQTniaM7g8ziHq cenw+s3Xi7yOaTwRBY3X1LrQ68ULthEQriG02IRk2DNsB0SZlqfUR7TkVFMjkcYlD0bl zgtiqdS0R5UbACOvHg8qcinkDf6Oqk9fOJQCOFdBEqTs3FZsRhYrbZawEejpF3fwl65S W2uw== X-Gm-Message-State: AFqh2koMgKCz7DpjVtaNKu4k2Zl1nHjMdFf1X9zZgk/H5LayW2JzFB3S u2WNl+HW+Gl0rnG2b4q1LE0miyFfudo= X-Google-Smtp-Source: AMrXdXvM9bB1u0UH5njw4DKII3zLwiYe4pOKg6RBBXzGJO8CgGu3qaDWm7DF8xlWqHgfpzjtMyFfIQ== X-Received: by 2002:adf:fa4e:0:b0:260:ebb2:ebf6 with SMTP id y14-20020adffa4e000000b00260ebb2ebf6mr12149370wrr.13.1672087677236; Mon, 26 Dec 2022 12:47:57 -0800 (PST) Received: from beren.harmstone.com ([2a02:8010:64ea:0:8eb8:7eff:fe53:9d5f]) by smtp.gmail.com with ESMTPSA id e27-20020adf9bdb000000b00272c0767b4asm10384990wrc.109.2022.12.26.12.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Dec 2022 12:47:56 -0800 (PST) Sender: Mark Harmstone From: Mark Harmstone To: binutils@sourceware.org Cc: Mark Harmstone Subject: [PATCH 3/3] ld/testsuite: Don't add index to sizes in pdb.exp Date: Mon, 26 Dec 2022 20:47:51 +0000 Message-Id: <20221226204751.23761-3-mark@harmstone.com> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221226204751.23761-1-mark@harmstone.com> References: <20221226204751.23761-1-mark@harmstone.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --- ld/testsuite/ld-pe/pdb.exp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ld/testsuite/ld-pe/pdb.exp b/ld/testsuite/ld-pe/pdb.exp index b2016313e96..60aa39ae130 100644 --- a/ld/testsuite/ld-pe/pdb.exp +++ b/ld/testsuite/ld-pe/pdb.exp @@ -256,8 +256,8 @@ proc check_dbi_stream { pdb } { set data [read $fi 4] binary scan $data i type_server_map_size - set data [read $fi 4] - binary scan $data i mfc_type_server_index + # skip MFC type server index + seek $fi 4 current set data [read $fi 4] binary scan $data i optional_dbg_header_size @@ -271,7 +271,7 @@ proc check_dbi_stream { pdb } { set stream_length [file size tmpdir/0003] - if { $stream_length != [expr 0x40 + $mod_info_size + $section_contribution_size + $section_map_size + $source_info_size + $type_server_map_size + $mfc_type_server_index + $optional_dbg_header_size + $ec_substream_size] } { + if { $stream_length != [expr 0x40 + $mod_info_size + $section_contribution_size + $section_map_size + $source_info_size + $type_server_map_size + $optional_dbg_header_size + $ec_substream_size] } { return 0 } -- 2.37.4