From patchwork Wed May 6 12:05:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 186255 Delivered-To: patch@linaro.org Received: by 2002:a92:8d81:0:0:0:0:0 with SMTP id w1csp2052896ill; Wed, 6 May 2020 05:09:41 -0700 (PDT) X-Google-Smtp-Source: APiQypIzCNluRENBvy/W6OupBHMPMFk15ivrS5/DyhsjAGRbUV690fm82uiXbkIUUBbZAnvhAzj7 X-Received: by 2002:ac8:6c23:: with SMTP id k3mr7807327qtu.107.1588766981762; Wed, 06 May 2020 05:09:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588766981; cv=none; d=google.com; s=arc-20160816; b=ya2K4buJJuneiGOg67hphNvyNLk7gJM24Kig985IuQOftd53cHXJ6qyqP4HmzLq32p RWCxBYYRI00+2zn+oUeptxnl0KH1206gT9SkEbdIFRmTUot8lFGXGycQEvIckP7tZIcI /KY0ylJvfkT6L338UgkhSL4g+Fx2BHI/wflqxcg8duq7tQzfVHIeL6EumM1tmojF7X99 GDROiE8W8awy2HgCm2NUae7KitVcMQIg31E7OeVnGZpM6ODDOHQVQ9f4NUPHwJFjfrAk eczqsWQO4LAXm2N2U0OobRXo7uPZUVQSz3RW5WDFmVf9n26Z0Ovz/iXfTcqWXPIDKcEY y/Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=To1Amsuya8/2bNrwNOCG3a0ICGx1JiOCuX19yjy7Jus=; b=Xh8QnoPtOWGKuZOcFCME1ZIFNBIXt3GAMQwk316k6yJrULb2dv6bJ22hugPWp+4zpy 3SEdpUKza8443zEeT+G27bjlEoK05NFTvJGs4yp1LSuQDriK1JKIt0BTYN+zZt9Lhu0g PpQoKPpN1NNhVM0jgNT7+811mnLb7EZCUcMQGv72BQoozlxk+qCgirCBS6dB/xFDWh8E jXeupwfpNqd2VVHxAPY1qXVZmiYKBHK1n6OyK4blHOxRn7lGauCrgTYBYAtrVR5f9A8t DuHTlIpdFZRCxAReNoPz2ERPOs62qdCDcuQS2+oUJnNdB0VFvX3euY/J3cNJq0OsTwMO eXcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jd4ijWyd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:470:142::17]) by mx.google.com with ESMTPS id a198si664885qkc.178.2020.05.06.05.09.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 May 2020 05:09:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) client-ip=2001:470:142::17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jd4ijWyd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWIrt-00066x-6N for patch@linaro.org; Wed, 06 May 2020 08:09:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWIoA-0006OE-JY for qemu-devel@nongnu.org; Wed, 06 May 2020 08:05:50 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:56021) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jWIo8-0001AS-V5 for qemu-devel@nongnu.org; Wed, 06 May 2020 08:05:50 -0400 Received: by mail-wm1-x333.google.com with SMTP id e26so2291608wmk.5 for ; Wed, 06 May 2020 05:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=To1Amsuya8/2bNrwNOCG3a0ICGx1JiOCuX19yjy7Jus=; b=jd4ijWydmt2SVD8mmixo09H/irXxNi7pM1YtA+gCa4YR7FPhWDky+spPeQ7hD7DM1v G4T9/0rBu3NnfW5ppt05zcgTIDo0TTciWizHFsOWSsTgUtIYAS6jgaXB6d3fLPv2/kWS jHTLIRJdz7Y1Wad9EX67LesLfCLjeyvNNomS6L/UeJSN3AHPEuo4wHvJbRVAu1fC2dU9 8vypFbxH3efYWZzw66ugsYRddMz+CqjEUJxXIPkDgLI8302kgrfDUkQ6qYTK1QmLifPx 8WupfYSmOHgJsCN2HTDQRLHXKSHtwKPSIPIOzIZD1PZ0oyTM6+5xeWLz9t/chM6QuTuM b8Vw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=To1Amsuya8/2bNrwNOCG3a0ICGx1JiOCuX19yjy7Jus=; b=hYDEVVFNPwFjcanfmjj2zvRpQsA7ST0JDiBt38fnPkLdFkVg2fA+CWMwIX/UyLnjkT xBu0ZLzVgiLYFUJO2+0lYWvlBruyQuzJmJnQn8eaGB6eOF1Zqv2qfNCeIcRT7DfIQEyh DJz8U7QmXt0GHho9WV41dSnyyv39M9CN30vrZVpT9MynsjuzDjFZPQBRMnM5qtZsWlfL vNIepr/gxb1cyTFJ4tcjYFromXn3Oy/2jYGGeSFb4FCFnSPH+7EC49kEEbPUh3qlrIEJ GPQcfzdv2f4dLiuC1SGu1Dp0gbJ9brZBSflNIjsMxEJllXwh+bZ5shBNlnIB6ouGr+rl 3Rog== X-Gm-Message-State: AGi0PuZUuf/c6Xgfg/Af6KF/1JGEEygztHCkfjWawOvJ0F+DQo5cQ7BW 1OfeDO8M+9QcwKAUuOMDhLiyPA== X-Received: by 2002:a1c:4956:: with SMTP id w83mr4022950wma.43.1588766746737; Wed, 06 May 2020 05:05:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h74sm1839374wrh.76.2020.05.06.05.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 May 2020 05:05:38 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C3CC41FF9B; Wed, 6 May 2020 13:05:30 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 12/14] tests/guest-debug: use the unix socket for linux-user tests Date: Wed, 6 May 2020 13:05:27 +0100 Message-Id: <20200506120529.18974-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200506120529.18974-1-alex.bennee@linaro.org> References: <20200506120529.18974-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now we have support for debugging over a unix socket for linux-user lets use it in our test harness. Signed-off-by: Alex Bennée Message-Id: <20200430190122.4592-8-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/guest-debug/run-test.py b/tests/guest-debug/run-test.py index 2bbb8fbaa38..d9af9573b9e 100755 --- a/tests/guest-debug/run-test.py +++ b/tests/guest-debug/run-test.py @@ -15,6 +15,8 @@ import argparse import subprocess import shutil import shlex +import os +from tempfile import TemporaryDirectory def get_args(): parser = argparse.ArgumentParser(description="A gdbstub test runner") @@ -41,11 +43,15 @@ if __name__ == '__main__': print("We need gdb to run the test") exit(-1) + socket_dir = TemporaryDirectory("qemu-gdbstub") + socket_name = os.path.join(socket_dir.name, "gdbstub.socket") + # Launch QEMU with binary if "system" in args.qemu: cmd = "%s %s %s -s -S" % (args.qemu, args.qargs, args.binary) else: - cmd = "%s %s -g 1234 %s" % (args.qemu, args.qargs, args.binary) + cmd = "%s %s -g %s %s" % (args.qemu, args.qargs, socket_name, + args.binary) inferior = subprocess.Popen(shlex.split(cmd)) @@ -56,7 +62,10 @@ if __name__ == '__main__': # disable prompts in case of crash gdb_cmd += " -ex 'set confirm off'" # connect to remote - gdb_cmd += " -ex 'target remote localhost:1234'" + if "system" in args.qemu: + gdb_cmd += " -ex 'target remote localhost:1234'" + else: + gdb_cmd += " -ex 'target remote %s'" % (socket_name) # finally the test script itself gdb_cmd += " -x %s" % (args.test)