From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.smtpout.orange.fr (smtp-20.smtpout.orange.fr [80.12.242.20]) by sourceware.org (Postfix) with ESMTPS id B2DAC385C6F5 for ; Wed, 9 Aug 2023 20:21:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B2DAC385C6F5 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org Received: from cyrano.home ([86.215.161.51]) by smtp.orange.fr with ESMTPA id TpgJquxgNE5mdTpgQq56Yu; Wed, 09 Aug 2023 22:21:30 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1691612490; bh=Ht2XS36QlC5nLHquJLiri2HV+ECZ94fmum87xx9W2SI=; h=From:To:Subject:Date:In-Reply-To:References; b=kRYoA8kU2by+Co41DZOoaSSGIlRJVu1ZPpAcvps5n3vRd1gMbcuHCtqVmqIlMW/14 Z4emyzbfFq9vBJoueYo8mT/h62Xnyww4JrnwOiHneMsLbbzMD4pci2XOnUDCcDds7n ONvGEmZzNwmDbE+JyCAKJTHYTniNGcMiNMN/TRJ6s8P4ih2dZ0YisRa28G6WCf0O9W Qv+J5vHmi5tkE4fEBPwAbTrZUqgJqpD+1qFaEK9TVWT/pK22GwOorexym7h6saPUrP bA/WZPzknJqSXW0B7WfVI3zTL8ncjp6eRQLYdZ5g3In3QY6poaffA8Ihfa6Mk0WqDT 8nZlNd9cYZRpw== 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 From: Mikael Morin 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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 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_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NEUTRAL,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: 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) -- 2.40.1