From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6528 invoked by alias); 15 Feb 2016 20:24:27 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 6481 invoked by uid 89); 15 Feb 2016 20:24:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=BAYES_00,KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy=pwd X-HELO: usplmg20.ericsson.net Received: from usplmg20.ericsson.net (HELO usplmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 15 Feb 2016 20:24:20 +0000 Received: from EUSAAHC005.ericsson.se (Unknown_Domain [147.117.188.87]) by usplmg20.ericsson.net (Symantec Mail Security) with SMTP id 41.E3.12433.33032C65; Mon, 15 Feb 2016 21:08:19 +0100 (CET) Received: from elxcz23q12-y4.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.87) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 15 Feb 2016 15:24:16 -0500 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 1/2] testsuite: Fix save-trace.exp writing outside standard output directory Date: Mon, 15 Feb 2016 20:24:00 -0000 Message-ID: <1455567851-2130-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2016-02/txt/msg00470.txt.bz2 In save-trace.exp, we want to test loading of a tracepoint definition file with a relative path (I am not sure why in fact). We currently use "savetrace-relative.tr", which ends up directly in testsuite/. If we use [standard_output_file] on that path, it becomes absolute. I decided to just replace [pwd] with . (a dot) in the path given by standard_output_file to make it relative. However, this trick only works because [pwd] is a prefix of the standard output directory. So I added a check to verify that precondition. gdb/testsuite/ChangeLog: * gdb.trace/save-trace.exp: Change relative path to be in the standard output directory. --- gdb/testsuite/gdb.trace/save-trace.exp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp index 7c897bb..3819034 100644 --- a/gdb/testsuite/gdb.trace/save-trace.exp +++ b/gdb/testsuite/gdb.trace/save-trace.exp @@ -151,7 +151,18 @@ proc do_save_load_test { save_path } { gdb_verify_tracepoints "verify trace setup" with_test_prefix "relative" { - do_save_load_test "savetrace-relative.tr" + set filepath [standard_output_file "savetrace-relative.tr"] + + # This only work because the pwd is a prefix of the standard output + # directory. If this assumption becomes false, then this test needs to be + # changed (the relative path from [pwd] to the standard output directory + # will become a bit more complicated to compute). + if {[string first [pwd] $filepath] != 0} { + error "[pwd] is not a prefix of $filepath." + } + + set filepath [string map "[pwd] ." $filepath] + do_save_load_test "$filepath" } with_test_prefix "absolute" { -- 2.5.1