From patchwork Thu Oct 19 12:35:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1851623 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=S0mB7fRk; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SB6gN2L5yz23jP for ; Thu, 19 Oct 2023 23:37:36 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 59ADC3857C45 for ; Thu, 19 Oct 2023 12:37:34 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id 9013F385841D for ; Thu, 19 Oct 2023 12:37:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9013F385841D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9013F385841D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697719046; cv=none; b=r1uwQyo3jTEI85w6C3Icn3yjT0wX52fmlHeJGFhrBvgLEKICXxALhgpZsnJ6BX77a+uVRFmoKnUwOJJOzqXRqoCUNMKsc9RIgsK/7L/oIkRz5Qvl5WvXJUkUYzcUPPGxbIG6LEPkUfJkovGNGqSmbY39gO1OfZ2AlfMbH7QB2Ao= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697719046; c=relaxed/simple; bh=Qbkf8Aj5szLWmczRvbA9QPf1URQTQFmrYrhY6qPn0zo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=U8p4aooYUnOYORi1oyx14tGmHkUfyGVjq3kyWKlWeljkzEHFvZiVvlupxvK6nmss2A7JRfQJAxkx1/3fmS+jBBxlLV3qWtiaTT1jNqmC3FryfHjsreQh3br2dKkn1m09CBthhfmzqij8nqYtsUOxeI8JfkOseeGYWIzYtmAgMSg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39JCOG3J027215 for ; Thu, 19 Oct 2023 12:37:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=9jbu6bGRSNnTkakj4MMsusX0ExrS31HxWqsUONLJJjA=; b=S0mB7fRkRvk5T2zXWswCrJfqGcOHEmNIPmy7OiASWcUXX8MBmCrXe5QzLCT7vds9NMPT eloql5jEX3y05I9rMBs02jaNqgeUSToLsHxOgMPDUjld5f/uPqiJsep5J4pVMvrIVDBk Ofb9vzNkuZuGh1CWjs6YvE+fkTTB4tarzk0P8KG4XFsdXFzVFJzZAnIcJKQXRK3Lux1X yRvGEs9z4azyUQqRE7Txpyr//TKtQDBHH7YwhbRD52Fdb5IMsZjEg5Omz+7+oLwDig3c IgwWAKB3nikRi4vswcW3yjR+dH6i2DTzgUcq4MzU9Zoi4iH3sihEnOdan4AjE66ptkMi Lg== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3tu4840ywr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 19 Oct 2023 12:37:21 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 39JCBiUe027190 for ; Thu, 19 Oct 2023 12:36:04 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3tr6tkrk5e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 19 Oct 2023 12:36:04 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 39JCa1xK39322188 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Oct 2023 12:36:01 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 986D720043; Thu, 19 Oct 2023 12:36:01 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 71EB220040; Thu, 19 Oct 2023 12:36:01 +0000 (GMT) Received: from t35lp56.lnxne.boe (unknown [9.152.108.100]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 19 Oct 2023 12:36:01 +0000 (GMT) From: Stefan Liebler To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH] tst-spawn-cgroup.c: Fix argument order of UNSUPPORTED message. Date: Thu, 19 Oct 2023 14:35:59 +0200 Message-ID: <20231019123559.3922193-1-stli@linux.ibm.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: El3vc9QAEVbOYiu8BIK4YAF4N-DdtNwg X-Proofpoint-GUID: El3vc9QAEVbOYiu8BIK4YAF4N-DdtNwg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-19_10,2023-10-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=4 priorityscore=1501 phishscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 spamscore=4 malwarescore=0 mlxlogscore=139 mlxscore=4 impostorscore=0 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000 definitions=main-2310190107 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org The arguments for "expected" and "got" are mismatched. Furthermore this patch is dumping both values as hex. Reviewed-by: Adhemerval Zanella Reviewed-by: Florian Weimer --- sysdeps/unix/sysv/linux/tst-spawn-cgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sysdeps/unix/sysv/linux/tst-spawn-cgroup.c b/sysdeps/unix/sysv/linux/tst-spawn-cgroup.c index 84e24696eb..a9843aeb89 100644 --- a/sysdeps/unix/sysv/linux/tst-spawn-cgroup.c +++ b/sysdeps/unix/sysv/linux/tst-spawn-cgroup.c @@ -136,9 +136,9 @@ create_new_cgroup (char **newcgroup) } if (!F_TYPE_EQUAL (fs.f_type, CGROUP2_SUPER_MAGIC)) - FAIL_UNSUPPORTED ("%s is not a cgroupv2 (expected %jx, got %jd)", - CGROUPFS, (intmax_t) fs.f_type, - (intmax_t) CGROUP2_SUPER_MAGIC); + FAIL_UNSUPPORTED ("%s is not a cgroupv2 (expected 0x%jx, got 0x%jx)", + CGROUPFS, (intmax_t) CGROUP2_SUPER_MAGIC, + (intmax_t) fs.f_type); char *cgroup = get_cgroup (); TEST_VERIFY_EXIT (cgroup != NULL);