From patchwork Wed Aug 9 20:21:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Morin X-Patchwork-Id: 133485 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp3053813vqr; Wed, 9 Aug 2023 13:24:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHneUGCzplO9AxC5QLbSmrQcH/U2axv7On1xGVBv3bIFFyo6C06/2lJjNeLvTz0SMDck/9c X-Received: by 2002:a5d:444f:0:b0:317:5b3f:1998 with SMTP id x15-20020a5d444f000000b003175b3f1998mr285894wrr.58.1691612685101; Wed, 09 Aug 2023 13:24:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691612685; cv=none; d=google.com; s=arc-20160816; b=DFl2Os0VHfyZQwdnIt7JEs39a+91ucrfTeIzUPat4AZWwkSAw8f788X6Rh8Fi10pml 0S99fq0m7OtQwC5OhKMOitmoMaMV0NPF1LGVmW55G6OnqFXVSQCj5KFN9lDS4iyyn32/ YO+J1Bj3HJIHxttUog14uR3Uv0KPEqML1F70GbMczYH5TRqaSZKpqQsyGMolxc7khciP kGmhVFydrZ/V3kk7CG6GXd4JTwWphRZVJJn2APHXbDajuXx5ET9vacNddefsduHal5In i4C+uCcJw8MMvHt3o8w+95PgbAqf2Yef77GA8tV3W5bJlE4Q12A1Pm5fyuXK/Sp8WAb7 BigQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=Ht2XS36QlC5nLHquJLiri2HV+ECZ94fmum87xx9W2SI=; fh=EAqAZnhg4AYtcBjfPm18lEF5V0R2rkI9MSWQf+svVaI=; b=C3Nb4xxL4baD+lBDmPt9FodTdE8gpZkl1d/2uXZBaRDDjzuMCuSUu20ih0ZjvByz1s Pu38JYOzU7Z1pwbnwBU2WLZ3hl2ihKq8/Fm5JzTA3PzGhJ+BR2f0+XEiGDYkZJ4MQWBN G5S8/8EfqMQBPMZ/ZGBnOFhA00cxWVix6TZfVS66pDtzkVLdhoqe9HqSXoJOs27tbrhZ WISR6fivtMepQS0+r1VUh5cFPjp7fQxv8nTDkqQco7/fUSTgelmPERr1AOEM7b47nShq Zz/y7RPW2QKLcPsNYJpCvo+TtrzNmkf2bxp/isJaWvAJzGHXuvzflNfkF9G5zEn1baFg ca2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=cB8F2vGz; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id z12-20020aa7d40c000000b005233567744fsi6072433edq.154.2023.08.09.13.24.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 13:24:45 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=cB8F2vGz; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5D863388200E for ; Wed, 9 Aug 2023 20:23:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5D863388200E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1691612594; bh=Ht2XS36QlC5nLHquJLiri2HV+ECZ94fmum87xx9W2SI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=cB8F2vGzGzITY5N+NCWLd4VNUJMoKwsknnd/su/00KKSiRM/mZQYwPWTE9HZLt6QG 9zBfw51osMapDmutpEybL7CAP+iQkY6LUBVYv4H04PDzsC8whZEa30aMaTpg/s3P8f XGliUfXrwY8gj64KfwpLPWCIrS+R0Fg41pNx07VU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.smtpout.orange.fr (smtp-19.smtpout.orange.fr [80.12.242.19]) by sourceware.org (Postfix) with ESMTPS id BB0E3385E021 for ; Wed, 9 Aug 2023 20:21:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB0E3385E021 Received: from cyrano.home ([86.215.161.51]) by smtp.orange.fr with ESMTPA id TpgJquxgNE5mdTpgQq56Yu; Wed, 09 Aug 2023 22:21:30 +0200 X-ME-Helo: cyrano.home X-ME-Auth: bW9yaW4tbWlrYWVsQG9yYW5nZS5mcg== X-ME-Date: Wed, 09 Aug 2023 22:21:30 +0200 X-ME-IP: 86.215.161.51 To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 3/3] testsuite: Use distinct explicit error codes in value_9.f90 Date: Wed, 9 Aug 2023 22:21:22 +0200 Message-Id: <20230809202122.695376-4-mikael@gcc.gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230809202122.695376-1-mikael@gcc.gnu.org> References: <20230809202122.695376-1-mikael@gcc.gnu.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mikael Morin via Gcc-patches From: Mikael Morin Reply-To: Mikael Morin Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773784463020935184 X-GMAIL-MSGID: 1773784463020935184 Use distinct error codes, so that we can spot directly from the testsuite log which case is failing. gcc/testsuite/ChangeLog: * gfortran.dg/value_9.f90 (val, val4, sub, sub4): Take the error codes from the arguments. (p): Update calls: pass explicit distinct error codes. --- gcc/testsuite/gfortran.dg/value_9.f90 | 108 +++++++++++++------------- 1 file changed, 56 insertions(+), 52 deletions(-) diff --git a/gcc/testsuite/gfortran.dg/value_9.f90 b/gcc/testsuite/gfortran.dg/value_9.f90 index 1a2fa80ed0d..4813250ebaa 100644 --- a/gcc/testsuite/gfortran.dg/value_9.f90 +++ b/gcc/testsuite/gfortran.dg/value_9.f90 @@ -20,78 +20,82 @@ program p ! Check len=1 actual argument cases first ca = "a"; cp = "b"; cd = "c" ca4 = 4_"d"; cp4 = 4_"e"; cd4 = 4_"f" - call val ("B","B") - call val ("A",char(65)) - call val ("A",char(a)) - call val ("A",mychar(65)) - call val ("A",mychar(a)) - call val ("1",c) - call val ("1",(c)) - call val4 (4_"C",4_"C") - call val4 (4_"A",char(65,kind=4)) - call val4 (4_"A",char(a, kind=4)) - call val4 (4_"4",c4) - call val4 (4_"4",(c4)) - call val (ca,ca) - call val (cp,cp) - call val (cd,cd) - call val (ca,(ca)) - call val4 (ca4,ca4) - call val4 (cp4,cp4) - call val4 (cd4,cd4) - call val4 (cd4,(cd4)) - call sub ("S") - call sub4 (4_"T") + call val ("B","B", 1, 2) + call val ("A",char(65), 3, 4) + call val ("A",char(a), 5, 6) + call val ("A",mychar(65), 7, 8) + call val ("A",mychar(a), 9, 10) + call val ("1",c, 11, 12) + call val ("1",(c), 13, 14) + call val4 (4_"C",4_"C", 15, 16) + call val4 (4_"A",char(65,kind=4), 17, 18) + call val4 (4_"A",char(a, kind=4), 19, 20) + call val4 (4_"4",c4, 21, 22) + call val4 (4_"4",(c4), 23, 24) + call val (ca,ca, 25, 26) + call val (cp,cp, 27, 28) + call val (cd,cd, 29, 30) + call val (ca,(ca), 31, 32) + call val4 (ca4,ca4, 33, 34) + call val4 (cp4,cp4, 35, 36) + call val4 (cd4,cd4, 37, 38) + call val4 (cd4,(cd4), 39, 40) + call sub ("S", 41, 42) + call sub4 (4_"T", 43, 44) ! Check that always the first character of the string is finally used - call val ( "U++", "U--") - call val4 (4_"V**",4_"V//") - call sub ( "WTY") - call sub4 (4_"ZXV") - call val ( "234", d ) - call val4 (4_"345", d4 ) - call val ( "234", (d) ) - call val4 (4_"345", (d4) ) - call val ( "234", d (1:2)) - call val4 (4_"345", d4(1:2)) - call val ( "234", d (1:l)) - call val4 (4_"345", d4(1:l)) - call val ("1",c // d) - call val ("1",trim (c // d)) - call val4 (4_"4",c4 // d4) - call val4 (4_"4",trim (c4 // d4)) + call val ( "U++", "U--", 45, 46) + call val4 (4_"V**",4_"V//", 47, 48) + call sub ( "WTY", 49, 50) + call sub4 (4_"ZXV", 51, 52) + call val ( "234", d , 53, 54) + call val4 (4_"345", d4 , 55, 56) + call val ( "234", (d) , 57, 58) + call val4 (4_"345", (d4) , 59, 60) + call val ( "234", d (1:2), 61, 62) + call val4 (4_"345", d4(1:2), 63, 64) + call val ( "234", d (1:l), 65, 66) + call val4 (4_"345", d4(1:l), 67, 68) + call val ("1",c // d, 69, 70) + call val ("1",trim (c // d), 71, 72) + call val4 (4_"4",c4 // d4, 73, 74) + call val4 (4_"4",trim (c4 // d4), 75, 76) cd = "gkl"; cd4 = 4_"hmn" - call val (cd,cd) - call val4 (cd4,cd4) - call sub (cd) - call sub4 (cd4) + call val (cd,cd, 77, 78) + call val4 (cd4,cd4, 79, 80) + call sub (cd, 81, 82) + call sub4 (cd4, 83, 84) deallocate (ca, cp, ca4, cp4, cd, cd4) contains - subroutine val (x, c) + subroutine val (x, c, err1, err2) character(kind=1), intent(in) :: x ! control: pass by reference character(kind=1), value :: c + integer, intent(in) :: err1, err2 print *, "by value(kind=1): ", c - if (c /= x) stop 1 + if (c /= x) stop err1 c = "*" - if (c /= "*") stop 2 + if (c /= "*") stop err2 end - subroutine val4 (x, c) + subroutine val4 (x, c, err1, err2) character(kind=4), intent(in) :: x ! control: pass by reference character(kind=4), value :: c + integer, intent(in) :: err1, err2 print *, "by value(kind=4): ", c - if (c /= x) stop 3 + if (c /= x) stop err1 c = 4_"#" - if (c /= 4_"#") stop 4 + if (c /= 4_"#") stop err2 end - subroutine sub (s) + subroutine sub (s, err1, err2) character(*), intent(in) :: s - call val (s, s) + integer, intent(in) :: err1, err2 + call val (s, s, err1, err2) end - subroutine sub4 (s) + subroutine sub4 (s, err1, err2) character(kind=4,len=*), intent(in) :: s - call val4 (s, s) + integer, intent(in) :: err1, err2 + call val4 (s, s, err1, err2) end character function mychar (i)