From patchwork Sun Mar 26 20:00:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Geissler X-Patchwork-Id: 66914 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 5F02638515FD for ; Sun, 26 Mar 2023 20:01:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5F02638515FD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679860871; bh=jgK73cIRJEX3ZQ5eavL37O5eM1HE+fJZF2ES9F34TDs=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=UCXUdEF25tFM/p9a4UTQHw+aZZKNRNqpop2k+gBePakP2Podr2/ASh5M3EtmoeAYn 561L6w2heBI312ZhL7cLlyToJiYfYsrrFEW0ZOFZWYMxPJtUmvydyO5MOHQCEksfk2 cUttQnaKigcV4TvSv5IbD38s3bnP3FPCJ+o4G+gU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 72B123858D39 for ; Sun, 26 Mar 2023 20:00:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 72B123858D39 Received: by mail-wm1-x329.google.com with SMTP id d11-20020a05600c3acb00b003ef6e6754c5so623742wms.5 for ; Sun, 26 Mar 2023 13:00:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679860845; x=1682452845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jgK73cIRJEX3ZQ5eavL37O5eM1HE+fJZF2ES9F34TDs=; b=2KBxQAJ80FlfhD6hyTTvoUPhzDLUgl3IimIAcQ1xcrE8miMuhYdg9julNgpyxARbz6 Lj5dbHq3bkTHAV+gRDnhhh5hopF5UIMgWj3xsNj1c1yOpDyIbIqcGbbXBf1s05kS5jmK cJApIYPM2aaBngB2XWG27O8RFgcXvWKiTyIl/+9dt9hGtQGg4hLuLnGdignBwxqPUUXw 1vxdxpCnFetSHQx3Agw0UgHIvpi8KXW1Myyh99p8xJYWhvHGpZhqsC22gQvQ+QL0atvc ixjX6YQdE9pvbPxPDdrq/IM0BWF4DOqiSz8NzDtWZ/K7dTR2J/rxiOI+A51LN3XFf9g+ Tp1w== X-Gm-Message-State: AO0yUKXW+knqoVtR+KNoP2jb9/dI53snGqpaCtfvwIBBmBmj/HbyJHkh sZtkWq/XL2uVzX3Q570Q4Gh5xoYy0dJs5Q== X-Google-Smtp-Source: AK7set94QEtvWpWsdXjW6w6XvS/frgF2WjMc6d8IRtI1TVWXgYGgXHoxw+BSRxgN+vuzjJokqhi1sg== X-Received: by 2002:a05:600c:470c:b0:3ee:7d85:e0d1 with SMTP id v12-20020a05600c470c00b003ee7d85e0d1mr8171642wmo.2.1679860844895; Sun, 26 Mar 2023 13:00:44 -0700 (PDT) Received: from localhost ([82.66.26.140]) by smtp.gmail.com with ESMTPSA id h21-20020a05600c315500b003ebff290a52sm6432173wmo.28.2023.03.26.13.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 13:00:44 -0700 (PDT) X-Google-Original-From: Romain Geissler To: libc-alpha@sourceware.org Cc: romain.geissler@amadeus.com Subject: [PATCH 3/3] Fix tst-glibc-hwcaps-prepend-cache with custom configure prefix value Date: Sun, 26 Mar 2023 20:00:16 +0000 Message-Id: <20230326200016.219-4-romain.geissler@amadeus.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230326200016.219-1-romain.geissler@amadeus.com> References: <20230326200016.219-1-romain.geissler@amadeus.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.6 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, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Romain Geissler via Libc-alpha From: Romain Geissler Reply-To: Romain Geissler Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- elf/tst-glibc-hwcaps-prepend-cache.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) Reviewed-by: Adhemerval Zanella diff --git a/elf/tst-glibc-hwcaps-prepend-cache.c b/elf/tst-glibc-hwcaps-prepend-cache.c index 2a448423495..fe074b28028 100644 --- a/elf/tst-glibc-hwcaps-prepend-cache.c +++ b/elf/tst-glibc-hwcaps-prepend-cache.c @@ -44,9 +44,13 @@ do_test (void) if (dlopen (SONAME, RTLD_NOW) != NULL) FAIL_EXIT1 (SONAME " is already on the search path"); - /* Install the default implementation of libmarkermod1.so. */ - xmkdirp ("/etc", 0777); - support_write_file_string ("/etc/ld.so.conf", "/glibc-test/lib\n"); + { + /* Install the default implementation of libmarkermod1.so. */ + char *conf_path = xasprintf ("%s/ld.so.conf", support_sysconfdir_prefix); + xmkdirp (support_sysconfdir_prefix, 0777); + support_write_file_string (conf_path, "/glibc-test/lib\n"); + free (conf_path); + } xmkdirp ("/glibc-test/lib/glibc-hwcaps/prepend2", 0777); xmkdirp ("/glibc-test/lib/glibc-hwcaps/prepend3", 0777); {