From patchwork Mon Nov 9 06:48:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 541603 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 6E8201402D4 for ; Mon, 9 Nov 2015 17:53:04 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=cTFn0eTp; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5A2064BD8F; Mon, 9 Nov 2015 07:50:26 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ILcF_6L5Y4UV; Mon, 9 Nov 2015 07:50:26 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ED9554BD97; Mon, 9 Nov 2015 07:49:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 757514BC85 for ; Mon, 9 Nov 2015 07:49:19 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id twLaQ3uBQJWY for ; Mon, 9 Nov 2015 07:49:19 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ob0-f174.google.com (mail-ob0-f174.google.com [209.85.214.174]) by theia.denx.de (Postfix) with ESMTPS id 1ACF44BBD1 for ; Mon, 9 Nov 2015 07:48:46 +0100 (CET) Received: by obdgf3 with SMTP id gf3so132985415obd.3 for ; Sun, 08 Nov 2015 22:48:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uHvvazOwjUGOWKJiOh3A1IZ4nBhe2KZlBbT28k0rqMU=; b=cTFn0eTpc0+QZhz3Zujh995f9F0CIvDlirBqqGLg0nhNSecx8wZvvxx6Hnd9H8O3Dv PPHOSPVYghz7YzyZJbRvo7nKuBKO621MbqnoGqGym6/cDlUbgEgv0Z+Qp8Wn0CkNXvU2 2dpKpyVjmykcMCOFQ5+Rwe8/fxaPsQbsbVBBo/8rGYw83VJ2ZmXnFX1OdktMRAp6xa8L MqyaREtx9fwajwAcuk6WHW28Z9XdPyhSpuqNCy6kVv9JE3+Lle2NRFXUzwwRDCPz97vH 2xRUEiZbZb4j+ay7+5yY4S/hrNACSpdVHYHQ4gjJPiGAEaSAyXT8Mfwt5tQfgJk51ibC CzIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=uHvvazOwjUGOWKJiOh3A1IZ4nBhe2KZlBbT28k0rqMU=; b=UGk/gV6fmlBHOi/LczhK/JAaPx6cnbQQiBJHk4Ox0GEhJhyU3wSSLlg1V0r9aowOSx WmJuy8WnYE6HPIwY17RmpPqAqhb0+qUT+xj20JUaM2Yyc88Gsrj8r3ZyvO02Gy0/OUmV sVMKnpYd0IUKjOHR+UzHEe3i6DMmo5G7KQ9bFcd7c1reccDx2CrXZibj33Z/k2crQpyp kDFJr/GvLe13nOperIE0KGW6NQGjHnKu4MYo8Z5ITUJwYFeN2aKzkawWmhQH7OsN4q+D mZhwDSk92C+DBUQfdMHT20UCYlyp1EkSAH8wIenBPQM1ogfUGsTzHrORRu0E4zh7zdAf SenQ== X-Gm-Message-State: ALoCoQk1pTziMUgmdJhRxHkgPLUBe9n/6yThsiXmtuyNtMR85uWXiyX6mDrU5I3CZ/5KWAhkFZF3 X-Received: by 10.182.144.162 with SMTP id sn2mr16334230obb.46.1447051725637; Sun, 08 Nov 2015 22:48:45 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id k4sm4182376oeq.6.2015.11.08.22.48.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Nov 2015 22:48:38 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id CC9BC22221B; Sun, 8 Nov 2015 23:48:25 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 8 Nov 2015 23:48:02 -0700 Message-Id: <1447051688-24936-21-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1447051688-24936-1-git-send-email-sjg@chromium.org> References: <1447051688-24936-1-git-send-email-sjg@chromium.org> Cc: Marek Vasut Subject: [U-Boot] [PATCH v2 20/26] dm: test: usb: Add a test for device reordering X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add tests that 'usb tree' produces the right output when a device changes order on the bus. Signed-off-by: Simon Glass --- Changes in v2: None test/dm/usb.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/test/dm/usb.c b/test/dm/usb.c index 721d3ad..fb193e8 100644 --- a/test/dm/usb.c +++ b/test/dm/usb.c @@ -208,3 +208,53 @@ static int dm_test_usb_tree_remove(struct unit_test_state *uts) return 0; } DM_TEST(dm_test_usb_tree_remove, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); + +const char usb_tree_reorder[] = +" 1 Hub (12 Mb/s, 100mA)\n" +" | sandbox hub 2345\n" +" |\n" +" |\b+-2 Mass Storage (12 Mb/s, 100mA)\n" +" | sandbox flash flash-stick@0\n" +" | \n" +" |\b+-3 Mass Storage (12 Mb/s, 100mA)\n" +" | sandbox flash flash-stick@2\n" +" | \n" +" |\b+-4 Mass Storage (12 Mb/s, 100mA)\n" +" sandbox flash flash-stick@1\n" +" \n"; + +/* + * test that the 'usb tree' command output looks correct when we reorder two + * devices. + */ +static int dm_test_usb_tree_reorder(struct unit_test_state *uts) +{ + struct udevice *dev, *parent; + char *data; + int len; + + /* Remove the second emulation device */ + ut_assertok(uclass_find_device_by_name(UCLASS_USB_EMUL, "flash-stick@1", + &dev)); + parent = dev->parent; + + /* Reorder the devices in the parent list and uclass list */ + list_del(&dev->sibling_node); + list_add_tail(&dev->sibling_node, &parent->child_head); + + list_del(&dev->uclass_node); + list_add_tail(&dev->uclass_node, &dev->uclass->dev_head); + + state_set_skip_delays(true); + ut_assertok(usb_init()); + console_record_reset_enable(); + usb_show_tree(); + len = membuff_getraw(&gd->console_out, -1, true, &data); + if (len) + data[len] = '\0'; + ut_asserteq_str(usb_tree_reorder, data); + ut_assertok(usb_stop()); + + return 0; +} +DM_TEST(dm_test_usb_tree_reorder, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);