From patchwork Tue Aug 5 16:22:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 117880 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D8AE9385843A for ; Tue, 5 Aug 2025 19:18:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D8AE9385843A Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=eCBW9+3H X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by sourceware.org (Postfix) with ESMTPS id CB744385840E for ; Tue, 5 Aug 2025 16:23:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CB744385840E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CB744385840E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1754410988; cv=none; b=jiQeapGVxQ4vWp/PuuwRHwnI7iTkETIac1r38bCbbyieGZThKHCcuE1Mjaks3oiYeTrWVI8j5YvtsaSkICx+yQtNnC/E0r3rJaVaEjuj+FHi53VLKkNklRril43PkOxmMv0Oy3ih/hzMW3fnOp1YtnCvlnNXI5We+fbTqH3CEnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1754410988; c=relaxed/simple; bh=MNB5RODxkbnlMkhIw9M+V/cgStNJe6r0M5rA0f4i6D4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=tlIA6DQ/6Oq423VPcdShpfRxCqjL4lPdRmBw8AGkdnwSt0JBajrN1EqcO4nsQB0uc4ENwu1WRt9wUEYuOxx2Zc+RT1hT9nplbsVAj+rhp43j3m/q+i/j03AOIMuEHy4Ksy0pgFtEqgJQO14OPgZvXvEIGXw/JxlrLF8P8hLhdXM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB744385840E Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-b34a6d0c9a3so5743908a12.3 for ; Tue, 05 Aug 2025 09:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754410987; x=1755015787; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iTu43c+dNJaeHGLKh0jxXaUZItyaL+j18bC9Ktivksc=; b=eCBW9+3H75gp+Zt/UhSY/R6D69FOEHd+gFNIWW77jPQL2QBbJmc4QX5ZjxW3leE5/w t4rd6tLoeGBYB0ZSdvG8civyFgr4whOX6DNDh/BT7m5ukGnc2KHKw5hS+GYy94ZuBDYk 5JMi4BDaby3qdEiWmTXNUKrmCmokfsMmEAJHWk9AXmHN/khH7YV8mZRjNgK6UtCQ18ok hOA9s/VKvrfarn5vlsei+3LONSL0/lBduKY7EePr62aST/QoPq6w+m5unL6L37qXrEec DaE19F4fRwRsUT+ClkN5iQ+pvpntKtKAaPJK53JphDslPslhT6cO34DHMZJrOwEjnGMr ly9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754410987; x=1755015787; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iTu43c+dNJaeHGLKh0jxXaUZItyaL+j18bC9Ktivksc=; b=MgD6CR4ZVgkjuWpUT2Mi4yRWglyptB47UDFUjunD5opyVBaimS65WVM/9tEt8ObgHU Lkp8avuNd83kzUc9Fv80kNMDX9PUUzSkD5epiMR7yYYm38aQsXgmIaJD/D58Gs6NJJYA qmG8GJHNwaQ8Do6nAjjBe3Eu6lgm4j3oY8VaN87ITP9/4x1P3v/OnyiW6H7+zKzxo/OC 1B6uP1i+/709Ze4TCME1D1ayEQwDXzuCl5ferSNSspKiKrBqrM7GTrA83aESX9KsSVGo mD8r2vAm5ygVKTDeg4wO4VmiAFEtBEgUQUc2UjDK0doCLBfUndPQHJ8v3ceDqJCm5Heh NuLg== X-Gm-Message-State: AOJu0YzduOK+QSURzrXiKWfhI73UE5Pg1lDByJb88iKLS4v0ieIF9BSC H4vmYjoAvlA98xGVvd1aOiyJDMr6RMJqT/lVU70dx1K1It1L+3gH/Ywn X-Gm-Gg: ASbGnctn1ndtiW39gsC2iizsFlC3yPeucbN1J/GLNlJoC0KYcXN5Xn5qzbHsvLuPlac LYQ8bZkPl7jXxjRFq2svRXt++RY81AbOW+Egj8RYtJfh2HCfwTsDc5mtZo6v7w0xH0TrZ9ztvSw MntnHfZaVixI6M7vGwV6JM+OOzaJwW7dBI9/ihsgqSPmXSYdT9mbonzclaSU7FQ+3QiRc2j8KtY orldOtfaSRwEKukrxIwh2jPvZQET8HOWWDT7ILLF56vUl+K45ZoIRzEQQB5AhZQujRMCcZj1gvg uMtPO2rF49OlmWeQ6Wno2S+G8fRN1EwYx2u2Tl7ogfE4Yi+Y2LgOYqDelTPpSTRMU+9mZl5UTQF AP/ysUo4x/3sbJ1t2op1JNSGJZ5RctSfEtLTiYNZeTkaBKVp+yQ== X-Google-Smtp-Source: AGHT+IEPuxQ1r72KHMee/u1sVFJ4OC6IcuYd7vrCObewLgb5VIMnr1HwModdoaQhbL0eV9VrGU9acw== X-Received: by 2002:a17:90b:1e09:b0:31f:16ee:5dcc with SMTP id 98e67ed59e1d1-321161f02fcmr22287993a91.14.1754410986553; Tue, 05 Aug 2025 09:23:06 -0700 (PDT) Received: from gnu-cfl-3.localdomain ([172.59.161.200]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31f63ee4f42sm17531490a91.23.2025.08.05.09.23.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Aug 2025 09:23:06 -0700 (PDT) Received: from gnu-cfl-3.localdomain (localhost [127.0.0.1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 240E6740356; Tue, 05 Aug 2025 09:23:05 -0700 (PDT) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: sam@gentoo.org Subject: [PATCH] Revert "tst-freopen4-main.c: Call support_capture_subprocess with chroot" Date: Tue, 5 Aug 2025 09:22:57 -0700 Message-ID: <20250805162257.3385025-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3015.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, 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~patchwork=sourceware.org@sourceware.org Revert commit 6463d4a7b28e5ee3891c34a8a1f0a59c24dfa9de to fix FAIL: stdio-common/tst-freopen4-mem FAIL: stdio-common/tst-freopen64-4-mem This fixes BZ #33254. --- stdio-common/tst-freopen4-main.c | 44 ++++++++++---------------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/stdio-common/tst-freopen4-main.c b/stdio-common/tst-freopen4-main.c index 436da4d203..3336f5327d 100644 --- a/stdio-common/tst-freopen4-main.c +++ b/stdio-common/tst-freopen4-main.c @@ -28,15 +28,25 @@ #include #include #include -#include -static void -do_test_chroot (void *data) +int +do_test (void) { - char *temp_dir = (char *) data; + mtrace (); + char *temp_dir; FILE *fp; int ret; + /* These chroot tests verify that either reopening a renamed or + deleted file works even in the absence of /proc, or that it fails + (without memory leaks); thus, for example, such reopening does + not crash in the absence of /proc. */ + + support_become_root (); + if (!support_can_chroot ()) + return EXIT_UNSUPPORTED; + + temp_dir = support_create_temp_directory ("tst-freopen4"); xchroot (temp_dir); /* Test freopen with NULL, renamed file. This verifies that @@ -86,32 +96,6 @@ do_test_chroot (void *data) puts ("freopen of deleted file failed (OK)"); free (temp_dir); -} - -int -do_test (void) -{ - mtrace (); - char *temp_dir; - - /* These chroot tests verify that either reopening a renamed or - deleted file works even in the absence of /proc, or that it fails - (without memory leaks); thus, for example, such reopening does - not crash in the absence of /proc. */ - - support_become_root (); - if (!support_can_chroot ()) - return EXIT_UNSUPPORTED; - - temp_dir = support_create_temp_directory ("tst-freopen4"); - - struct support_capture_subprocess result; - result = support_capture_subprocess (do_test_chroot, temp_dir); - support_capture_subprocess_check (&result, "freopen4", 0, - sc_allow_stdout); - fputs (result.out.buffer, stdout); - support_capture_subprocess_free (&result); - return 0; }