Received: by 2002:a5d:925a:0:0:0:0:0 with SMTP id e26csp718102iol; Thu, 9 Jun 2022 12:24:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLk3D0y+zxCNLtr0re4f+l8vSF7Qh/1j+cAyyehPy5KVsNKj/waEGZ2L3GTE3ZkyTQ5WHF X-Received: by 2002:a17:902:7b8b:b0:168:a7d0:ddf3 with SMTP id w11-20020a1709027b8b00b00168a7d0ddf3mr5129929pll.118.1654802648245; Thu, 09 Jun 2022 12:24:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654802648; cv=none; d=google.com; s=arc-20160816; b=UKAHvMuIYVtcsiOiVJF62WEUoRqcO3aqrX4Zd8rhuScBPG0qozN2f2KcJfDki5maxI Qllpr3TBrcGodmWuQeh9gs2bqikqhLP4S55UYmJYvL6bijgv3LhbGui9goQKxo9VUp0r uvKxwRm8VWw61AjnCmXynreuhOeRgtsstZSjwdm+HIU82cI3V4jgUzVnvT2wB8DHCk9B wHCBu8T+3yQA5qb2zOkt2zf7WTLxfno5ms89pIPxpHzgQ1TdndJbmTAfehfP4H1ATXHQ /kRzgvOPXIksHubYpKFvBlKLi5oRWZ7FJ47fi9lD8raVaKNjuyZP43a4MWzKZrxp9SEk GbLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=9Z1Lew6zWdR/2t2Xs6pYFUbcScNr4o83okRamUdMrDw=; b=ygNE5U5jQ0o3/TAXQVhQBD+J1G9CMnNs8tiC+2ioj6+GkEo5cUBEaUumIbVjNNNM+C RGfmmeEQ6MQbPdXOZLGpRB/i0CojTdqE2QisgDrbuw5X9CD/31rHwHEvz9sWCD1i5k2X f8ET5hNOqVzgdeVvJjrFoJ0kdbdoUT+isHcTLfH/4g5JDA5lPncMJd/YycrhoEOmG1nI uqk0oT2ZmshXMgGu9+fOGGwUMsKn+Zwx817sv+34nBIIPjl8DQaNrrdauzO7aUWza1ag YQ/SvCE7/ZdRKs6wDRl/5k0SBPCMLAO+t4Da37LGAnGXS/URyjjzedjNaA33x0xlOSG1 zWqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=YU9Vftin; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k189-20020a6384c6000000b003fe0f7baa87si10420019pgd.329.2022.06.09.12.23.54; Thu, 09 Jun 2022 12:24:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=YU9Vftin; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234404AbiFITFH (ORCPT + 99 others); Thu, 9 Jun 2022 15:05:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239775AbiFITFB (ORCPT ); Thu, 9 Jun 2022 15:05:01 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF96B53E3D for ; Thu, 9 Jun 2022 12:05:00 -0700 (PDT) Received: from localhost.localdomain (67.227.121.78.rev.sfr.net [78.121.227.67]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: fdanis) by madras.collabora.co.uk (Postfix) with ESMTPSA id 537E56601733 for ; Thu, 9 Jun 2022 20:04:59 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1654801499; bh=En+fAWEBvwJl/i8IXsczyS1JptV0VNKhphAHjKqQ254=; h=From:To:Subject:Date:In-Reply-To:References:From; b=YU9VftinTkfIn8l2ZN+z5VqXiHkl5TUw8sbUZdpNeBirwme+NmjFPAorXA3UPpIp/ n1j6MljhvFPorz3rAcPC7DZWoLLcRbsjG6J+lGJJIPAfqNnTG2YtzVV0OQq31mqfrM jA+gtt5266EKUPz95qFThTwRdBuhkeF22tDhoF078r9v4JiFoTaOPhR1hNi483wkOh +fnmZV5xGVXoQf1adfFmn9TC1AXQTQvbcbQ+iE5ot6ZhDVex06ENqYzV9R1p8jkrp4 Vqbi+1ITIAZxlEOQ3AcwXsdOMz/O0fbmXhINVlQtvecANMBU2JwbaMU2bL5Z9VEbf0 6oWsh3aJ0qEkg== From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= To: linux-bluetooth@vger.kernel.org Subject: [PATCH 3/3] test-runner: Add udevd and trigger events Date: Thu, 9 Jun 2022 21:04:42 +0200 Message-Id: <20220609190442.74325-4-frederic.danis@collabora.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220609190442.74325-1-frederic.danis@collabora.com> References: <20220609190442.74325-1-frederic.danis@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Kernel events should have been managed so the audio card is accessible from PipeWire --- tools/test-runner.c | 83 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-) diff --git a/tools/test-runner.c b/tools/test-runner.c index 77007def4..db7f762a6 100644 --- a/tools/test-runner.c +++ b/tools/test-runner.c @@ -251,13 +251,14 @@ static void start_qemu(void) "rootfstype=9p " "rootflags=trans=virtio,version=9p2000.L " "acpi=off pci=noacpi noapic quiet ro init=%s " - "bluetooth.enable_ecred=1" + "bluetooth.enable_ecred=1 " "TESTHOME=%s TESTDBUS=%u TESTDAEMON=%u " "TESTDBUSSESSION=%u XDG_RUNTIME_DIR=/run/user/0 " + "AUDIO_SUPPORT=%u " "TESTMONITOR=%u TESTEMULATOR=%u TESTDEVS=%d " "TESTAUTO=%u TESTARGS=\'%s\'", initcmd, cwd, start_dbus, start_daemon, - start_dbus_session, + start_dbus_session, audio_support, start_monitor, start_emulator, num_devs, run_auto, testargs); @@ -724,13 +725,70 @@ static pid_t start_btvirt(const char *home) return pid; } +static void trigger_udev(void) +{ + char *argv[3], *envp[1]; + pid_t pid; + + argv[0] = "/bin/udevadm"; + argv[1] = "trigger"; + argv[2] = NULL; + + envp[0] = NULL; + + printf("Triggering udev events\n"); + + pid = fork(); + if (pid < 0) { + perror("Failed to fork new process"); + return; + } + + if (pid == 0) { + execve(argv[0], argv, envp); + exit(EXIT_SUCCESS); + } + + printf("udev trigger process %d created\n", pid); +} + +static pid_t start_udevd(void) +{ + char *argv[2], *envp[1]; + pid_t pid; + + argv[0] = "/lib/systemd/systemd-udevd"; + argv[1] = NULL; + + envp[0] = NULL; + + printf("Starting udevd daemon\n"); + + pid = fork(); + if (pid < 0) { + perror("Failed to fork new process"); + return -1; + } + + if (pid == 0) { + execve(argv[0], argv, envp); + exit(EXIT_SUCCESS); + } + + printf("udevd daemon process %d created\n", pid); + + trigger_udev(); + + return pid; +} + static void run_command(char *cmdname, char *home) { char *argv[9], *envp[3]; int pos = 0, idx = 0; int serial_fd; pid_t pid, dbus_pid, daemon_pid, monitor_pid, emulator_pid, - dbus_session_pid; + dbus_session_pid, udevd_pid; if (num_devs) { const char *node = "/dev/ttyS1"; @@ -746,6 +804,11 @@ static void run_command(char *cmdname, char *home) } else serial_fd = -1; + if (audio_support) + udevd_pid = start_udevd(); + else + udevd_pid = -1; + if (start_dbus) { create_dbus_system_conf(); dbus_pid = start_dbus_daemon(false); @@ -874,6 +937,11 @@ start_next: monitor_pid = -1; } + if (corpse == udevd_pid) { + printf("udevd terminated\n"); + udevd_pid = -1; + } + if (corpse == pid) break; } @@ -898,6 +966,9 @@ start_next: if (monitor_pid > 0) kill(monitor_pid, SIGTERM); + if (udevd_pid > 0) + kill(udevd_pid, SIGTERM); + if (serial_fd >= 0) { close(serial_fd); serial_fd = -1; @@ -980,6 +1051,12 @@ static void run_tests(void) start_emulator = true; } + ptr = strstr(cmdline, "AUDIO_SUPPORT=1"); + if (ptr) { + printf("Audio support requested\n"); + audio_support = true; + } + ptr = strstr(cmdline, "TESTHOME="); if (ptr) { home = ptr + 4; -- 2.25.1