From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 303D3386F011 for ; Wed, 27 Jan 2021 13:27:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 303D3386F011 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wm1-x32f.google.com with SMTP id c128so1659967wme.2 for ; Wed, 27 Jan 2021 05:27:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WfqcmHqXxbeymUdWpDGOeOsIJ5kgDDpa5f3uu7CECZI=; b=LHPkf7zuQfu/ZmAjUAz6anWu8VOO78vGqloFixXkynmkBLe0VB8E9eNq5e5FKN5/6s pZ5T/b6rPOjkhi1djO5zyMq1Ovypmeax/Jl0vwe6OoILjzLF2GPTxEGik4IzasOF6kUu 5sHCZIlExVXKqSkN6So57Pm7/TzXYPVXfmxI/aoFKEev2RHSzdAPoJJZ7Qcx/jiyx4X1 b4Q9l4YZClxyH1nVZudQAu/rW5pZ8x3p0TnFaLnVW9eZ45Pub9er4LfGVwJbzyZj1j33 32JhLkHv5Gu8ZYs0m9BzcC/8zVP+ldDuugB0tVKEMNKZz/poOqIBOfvOWiLEsAZF7kWc zdgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WfqcmHqXxbeymUdWpDGOeOsIJ5kgDDpa5f3uu7CECZI=; b=tlQSY4giF2ShgqzV3regDT2AQFQ040LdOJaN1Pq/I/sMvgMjw5HHrkuYhHROx9Vkdf 9rn2dCcCP4G+dl63GC4nImS39ziZNiYpH/C73Pu5ylOcYRZzvmVV/SDHTa6Y3pnQTbm/ Yveb6jE11CjPivGXhB5p3aE0W+7t2uADPoeoCyGlYU+XwfdGfXf3BbBZV+j9Fr6j2Z9q DKwHjiiqmFLrvTK1g8XOvh4aZn7113tOU2FGjmedbfRpZX6+gPbDJ+2SPKdCU8Dmd+CP nnDFi0T4elLODUZzkI2+NWU37AfDuQd9htbStRN+jf2sJL5jcB1pF/Lolcmvi8w7TqL2 8WVg== X-Gm-Message-State: AOAM5302YL5+OZHnHoytjgqjD2/2iSK2EJmJryRvkr4M2j4sbie2SMvK AVZKAxK4O862/pnzun5pLBRYpKA/gQ8CTQ== X-Google-Smtp-Source: ABdhPJyJ0jqD+HJOiumOdC2GTQ4NKujdqJ11sbCfhNeDfIhKbAy/g6DKEu7kRvD8Ly/Y1AVB40B0Iw== X-Received: by 2002:a1c:46c5:: with SMTP id t188mr4224603wma.170.1611754069083; Wed, 27 Jan 2021 05:27:49 -0800 (PST) Received: from localhost (host86-166-129-180.range86-166.btcentralplus.com. [86.166.129.180]) by smtp.gmail.com with ESMTPSA id t25sm2355796wmj.39.2021.01.27.05.27.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 05:27:48 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH] gdb/testsuite: unset XDG_CONFIG_HOME Date: Wed, 27 Jan 2021 13:27:45 +0000 Message-Id: <20210127132745.4061609-1-andrew.burgess@embecosm.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2021 13:27:51 -0000 Since this commit: commit 64aaad6349d2b2c45063a5383f877ce9a3a0c354 Date: Fri Sep 25 14:50:56 2020 +0100 gdb: use get_standard_config_dir when looking for .gdbinit GDB has been checking for ${XDG_CONFIG_HOME}/gdb/gdbinit on startup. Most tests pass -nx to GDB to block loading of gdbinit files, but there are a few tests (e.g. gdb.base/gdbinit-history.exp) that don't use -nx and instead setup a fake HOME directory containing a gdbinit file. However, since the above commit, if XDG_CONFIG_HOME is set then once -nx is no longer being passed GDB will load any gdbinit file it finds in that directory, which could cause the test to fail. As a concrete example: $ mkdir -p fake_xdg_config_home/gdb/ $ cat <fake_xdg_config_home/gdb/gdbinit echo goodbye\n quit EOF $ export XDG_CONFIG_HOME=$PWD/fake_xdg_config_home $ make check-gdb TESTS="gdb.base/gdbinit-history.exp" Should result in the test failing. The solution I propose is to unset XDG_CONFIG_HOME in default_gdb_init, we already unset a bunch of environment variables in this proc. gdb/testsuite/ChangeLog: * lib/gdb.exp (default_gdb_init): Unset XDG_CONFIG_HOME. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/lib/gdb.exp | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 2a952c6146f..53ac9f1408c 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5241,6 +5241,13 @@ proc default_gdb_init { test_file_name } { unset -nocomplain ::env(GDBHISTFILE) unset -nocomplain ::env(GDBHISTSIZE) + # Ensure that XDG_CONFIG_HOME is not set. Some tests setup a fake + # home directory in order to test loading settings from gdbinit. + # If XDG_CONFIG_HOME is set then GDB will load a gdbinit from + # there (if one is present) rather than the home directory setup + # in the test. + unset -nocomplain ::env(XDG_CONFIG_HOME) + # Initialize GDB's pty with a fixed size, to make sure we avoid pagination # during startup. See "man expect" for details about stty_init. global stty_init -- 2.25.4