From patchwork Thu Dec 12 18:54:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 181515 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp1160950och; Thu, 12 Dec 2019 10:58:07 -0800 (PST) X-Google-Smtp-Source: APXvYqx/hp5UDDA6UjWkNGpSs848+hRS4qa6gxzs+Zzjp2VLoDI9DUuCh91+AwQCQzEEyRdGI4Kn X-Received: by 2002:a05:6830:1741:: with SMTP id 1mr10301127otz.295.1576177087600; Thu, 12 Dec 2019 10:58:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576177087; cv=none; d=google.com; s=arc-20160816; b=u0H5uzZltgqN3vfX3UghlK6YeSimPX1hew6g1ZRoLY4FIvIgANarb31fDxrWkrdCv8 OrEzowf8zd5njgOx0YTBhJ/j4k8DEaiLNWZ1VaxIbWV2ZpeGQqYeR6iiL4bXZG9xEuc+ U9HXU6ZBZJziyM+YJVGpL/XMcwdEgy+iZ6IuKeqikfuEiLG59r8tUWitCBrKr6jINcxe LQzKVdjGy5sQsCu9CcMvt7kgjjbc1wSb7f13PlVI9+D3E8J+o8bxz8zZj9WZjNB/OWe1 PGVa0ePkWzoZWjjiPVDOwhaVjFasET7ekLVTHdzUjkHC44ZEHb/zGCgjHmnE8hJnkCvJ Eotg== 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=4CeObgrpqME/H5gUhHJMZVtmA8RRafdQNdxrTROk0Ig=; b=06P7CYWr2VJZ9xtA1NQZSePQitvfztB4LCXxJCputi9GqieP2xczPm8btBycH22fHy eiZmDihmLEwbnWPDQ4XP4KENrQZ7ZM3KuefT3XRqLXXmjzzFESwb8OxyD2P0ZhN/oB6a MRXUq6hTlWYWoOr0oxmvU4ang3+e8UrG0HHov6xVi83Jk8VXMGJGMzMSxJYnSqvMRc8D DDm4n4RF6/q0PEskOpnDqGdvKfKT0yiEQcDKXAKeZBlEP+EPdsuuk6QC2t7InQKExNu7 uqdscFLiwOINFtJEtkbZgWEEURgNmwFKBZN4WELlGomlK6CRaAuD2GSXJcu9MNIqnlkl mRXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="CrCS8/bG"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s4si3640968otd.113.2019.12.12.10.58.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Dec 2019 10:58:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="CrCS8/bG"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifTf4-0005s2-EC for patch@linaro.org; Thu, 12 Dec 2019 13:58:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46100) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifTbp-0002Nv-OG for qemu-devel@nongnu.org; Thu, 12 Dec 2019 13:54:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifTbo-0008L6-KQ for qemu-devel@nongnu.org; Thu, 12 Dec 2019 13:54:45 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32310 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ifTbo-0008K4-GJ for qemu-devel@nongnu.org; Thu, 12 Dec 2019 13:54:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576176884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4CeObgrpqME/H5gUhHJMZVtmA8RRafdQNdxrTROk0Ig=; b=CrCS8/bGsNLVOs0YXXnrJaMsXzbhnK/dUIzOwO9gdsLUojnS8zGD/3W+Eva4E/phff1Irm CYsogkbCZe5PbHBe0zYXNQOnI5d3AlsPSYpz7L2R8HsWQ3fFrjQo/iRxRPDo7QaVKmM/PT 7EFkpbQ4koF7OLQg2knI6H2qbbppCF8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-66-E03gZje-Msa4dC7IF7P8FA-1; Thu, 12 Dec 2019 13:54:42 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F41EE1800D45; Thu, 12 Dec 2019 18:54:40 +0000 (UTC) Received: from thuth.com (ovpn-116-168.ams2.redhat.com [10.36.116.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80A7419C4F; Thu, 12 Dec 2019 18:54:39 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell , Stefan Hajnoczi , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 05/10] tests: fix modules-test 'duplicate test case' error Date: Thu, 12 Dec 2019 19:54:19 +0100 Message-Id: <20191212185424.4675-6-thuth@redhat.com> In-Reply-To: <20191212185424.4675-1-thuth@redhat.com> References: <20191212185424.4675-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: E03gZje-Msa4dC7IF7P8FA-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Cole Robinson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cole Robinson ./configure --enable-sdl --audio-drv-list=sdl --enable-modules Will generate two identical test names: /$arch/module/load/sdl Which generates an error like: (tests/modules-test:23814): GLib-ERROR **: 18:23:06.359: duplicate test case path: /aarch64//module/load/sdl Add the subsystem prefix in the name as well, so instead we get: /$arch/module/load/audio-sdl /$arch/module/load/ui-sdl Signed-off-by: Cole Robinson Message-Id: Reviewed-by: Marc-André Lureau Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- tests/modules-test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.18.1 diff --git a/tests/modules-test.c b/tests/modules-test.c index d1a6ace218..88217686e1 100644 --- a/tests/modules-test.c +++ b/tests/modules-test.c @@ -64,7 +64,8 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); for (i = 0; i < G_N_ELEMENTS(modules); i += 2) { - char *testname = g_strdup_printf("/module/load/%s", modules[i + 1]); + char *testname = g_strdup_printf("/module/load/%s%s", + modules[i], modules[i + 1]); qtest_add_data_func(testname, modules + i, test_modules_load); g_free(testname); }