From patchwork Mon Oct 15 09:21:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 983999 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Upbna4hU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42YXvW0Hx8z9sBj for ; Mon, 15 Oct 2018 20:19:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AE46EC21DA2; Mon, 15 Oct 2018 09:18:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3F062C21E52; Mon, 15 Oct 2018 09:16:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D6B9CC21E35; Mon, 15 Oct 2018 09:16:48 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by lists.denx.de (Postfix) with ESMTPS id AD1A3C21DB6 for ; Mon, 15 Oct 2018 09:16:42 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id f18-v6so9004087plr.1 for ; Mon, 15 Oct 2018 02:16:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=htpB1SAuHg5qXppoSRzOx8+D0yJRhLq1X3d8TuAxsug=; b=Upbna4hU2AgtnjPb9JpayXdH/dmD3vYsh8soVYVdmzAM9hvMSbujofn5xdZflzROlV q4YVUl/UWO/fpu6jNZR64853ryGX+dsZrChF4twKUUsvXXWowsk0Ocl155CH59Qjclr5 jLad8SCddmqovfzX6mZayi0vzyhXyXkwzYAQDLrxwiUTmpZanZgNJXz3gzzG4RaIVBsg qAReoOlPphVO7773V7TsPYrXP3nRWqn+IyHmBcWf1Qwv1fe5fmxntXtQEBjsKCyIzH9g PX1+GvMFuE5cdFdsYuRHonxrSxyHIap9SoPbP2BhQXQO9rgTDhl6gh5CkKSb4pG+rtqG ge9Q== 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; bh=htpB1SAuHg5qXppoSRzOx8+D0yJRhLq1X3d8TuAxsug=; b=P4xo59u37+aujplaAjpN/e+V/W3ojFqOVVusJzk0/4WSFGELKoLBRsUhKmj8Hn5Q8o yVhyb4wmPG8bzbIWtbHHKCDezPlmQFc6Ms/+Zq1rrPdI+BB5mjveSSS1IHUPZ/0bvDf2 v8PNn7gt1b8XBHGt4cpI0ycj/CeKVeURa3tq3OsHnzV8hiPQNfUcfh/uZwXNjOI9O1qc tMHhqNYxXtxqJf3acg07iBWLDFE/v0O9MDvrMm7FniceWOMaetd54kegzRzatNZIIQV7 ri6F0VEea5jPchQC+zp/aCcALuAnA51KGvx3+BE+SUE+IfJzpTD+ch/TN1yK3fRGh2nz mYKg== X-Gm-Message-State: ABuFfoh8XKtKqm4CdBbXMR8/AoqpnIT5dqt96OPuyAB3/8xvMwPKmNqc Gau6G9ocjXfTd4WIOr64NyeVir8f X-Google-Smtp-Source: ACcGV63zHlTtcJGSeDnPnZP5PWbdN2cwGmtvHv9VUWLj0yV/jQZXss7PxaX0W20Gv/qkgk0UfwgHvQ== X-Received: by 2002:a17:902:3fe4:: with SMTP id a91-v6mr16244348pld.187.1539595001333; Mon, 15 Oct 2018 02:16:41 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com. [147.11.156.139]) by smtp.gmail.com with ESMTPSA id a11-v6sm10798256pgw.54.2018.10.15.02.16.40 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Oct 2018 02:16:40 -0700 (PDT) From: Bin Meng To: Simon Glass , U-Boot Mailing List Date: Mon, 15 Oct 2018 02:21:04 -0700 Message-Id: <1539595287-31378-9-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1539595287-31378-1-git-send-email-bmeng.cn@gmail.com> References: <1539595287-31378-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v3 08/31] test: dm: blk: Correct blk_base test case X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The blk_base test case creates a USB mass storage block device with the Sandbox host block device as its parent. This does not make any sense and causes potential issue, for example if the test case tries to read/write anything on the USB mass storage block device it will definitely fail as its parent is not on USB bus at all. Correct the test case by creating another Sandbox host block device instead of the USB mass storage one and adjust the case accordingly. Signed-off-by: Bin Meng Reviewed-by: Simon Glass Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- Changes in v3: None Changes in v2: None test/dm/blk.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/test/dm/blk.c b/test/dm/blk.c index 4de477b..9c71adc 100644 --- a/test/dm/blk.c +++ b/test/dm/blk.c @@ -15,34 +15,29 @@ DECLARE_GLOBAL_DATA_PTR; /* Test that block devices can be created */ static int dm_test_blk_base(struct unit_test_state *uts) { - struct udevice *blk, *usb_blk, *dev; + struct udevice *blk1, *blk3, *dev; /* Make sure there are no block devices */ - ut_asserteq(-ENODEV, uclass_get_device_by_seq(UCLASS_BLK, 0, &blk)); + ut_asserteq(-ENODEV, uclass_get_device_by_seq(UCLASS_BLK, 0, &dev)); /* Create two, one the parent of the other */ ut_assertok(blk_create_device(gd->dm_root, "sandbox_host_blk", "test", - IF_TYPE_HOST, 1, 512, 2, &blk)); - ut_assertok(blk_create_device(blk, "usb_storage_blk", "test", - IF_TYPE_USB, 3, 512, 2, &usb_blk)); + IF_TYPE_HOST, 1, 512, 2, &blk1)); + ut_assertok(blk_create_device(blk1, "sandbox_host_blk", "test", + IF_TYPE_HOST, 3, 512, 2, &blk3)); /* Check we can find them */ ut_asserteq(-ENODEV, blk_get_device(IF_TYPE_HOST, 0, &dev)); ut_assertok(blk_get_device(IF_TYPE_HOST, 1, &dev)); - ut_asserteq_ptr(blk, dev); - - ut_asserteq(-ENODEV, blk_get_device(IF_TYPE_USB, 0, &dev)); - ut_assertok(blk_get_device(IF_TYPE_USB, 3, &dev)); - ut_asserteq_ptr(usb_blk, dev); + ut_asserteq_ptr(blk1, dev); + ut_assertok(blk_get_device(IF_TYPE_HOST, 3, &dev)); + ut_asserteq_ptr(blk3, dev); /* Check we can iterate */ ut_assertok(blk_first_device(IF_TYPE_HOST, &dev)); - ut_asserteq_ptr(blk, dev); - ut_asserteq(-ENODEV, blk_next_device(&dev)); - - ut_assertok(blk_first_device(IF_TYPE_USB, &dev)); - ut_asserteq_ptr(usb_blk, dev); - ut_asserteq(-ENODEV, blk_next_device(&dev)); + ut_asserteq_ptr(blk1, dev); + ut_assertok(blk_next_device(&dev)); + ut_asserteq_ptr(blk3, dev); return 0; }