From: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org,
"Michał Winiarski" <michal.winiarski@intel.com>,
"Petri Latvala" <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t v2 13/16] tests/core_hotunplug: Process return values of sysfs operations
Date: Fri, 7 Aug 2020 11:19:59 +0200 [thread overview]
Message-ID: <20200807092002.32350-14-janusz.krzysztofik@linux.intel.com> (raw)
In-Reply-To: <20200807092002.32350-1-janusz.krzysztofik@linux.intel.com>
Return values of driver bind/unbind / device remove/recover sysfs
operations are now ignored. Assert their correctness.
v2: Add trailing newlines missing from igt_assert messages,
- rebase on current upstream master.
Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
---
tests/core_hotunplug.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c
index a4902eba2..48affce9b 100644
--- a/tests/core_hotunplug.c
+++ b/tests/core_hotunplug.c
@@ -95,7 +95,9 @@ static void driver_unbind(struct hotunplug *priv, const char *prefix)
igt_debug("%sunbinding the driver from the device\n", prefix);
igt_set_timeout(60, "Driver unbind timeout!");
- igt_sysfs_set(priv->fd.sysfs_drv, "unbind", priv->dev_bus_addr);
+ igt_assert_f(igt_sysfs_set(priv->fd.sysfs_drv, "unbind",
+ priv->dev_bus_addr),
+ "Driver unbind failure!\n");
igt_reset_timeout();
}
@@ -105,7 +107,9 @@ static void driver_bind(struct hotunplug *priv)
igt_debug("rebinding the driver to the device\n");
igt_set_timeout(60, "Driver re-bind timeout!");
- igt_sysfs_set(priv->fd.sysfs_drv, "bind", priv->dev_bus_addr);
+ igt_assert_f(igt_sysfs_set(priv->fd.sysfs_drv, "bind",
+ priv->dev_bus_addr),
+ "Driver re-bind failure\n!");
igt_reset_timeout();
}
@@ -122,7 +126,8 @@ static void device_unplug(struct hotunplug *priv, const char *prefix)
igt_debug("%sunplugging the device\n", prefix);
igt_set_timeout(60, "Device unplug timeout!");
- igt_sysfs_set(priv->fd.sysfs_dev, "remove", "1");
+ igt_assert_f(igt_sysfs_set(priv->fd.sysfs_dev, "remove", "1"),
+ "Device unplug failure\n!");
igt_reset_timeout();
priv->fd.sysfs_dev = local_close(priv->fd.sysfs_dev);
@@ -136,7 +141,8 @@ static void bus_rescan(struct hotunplug *priv)
igt_debug("recovering the device\n");
igt_set_timeout(60, "Bus rescan timeout!");
- igt_sysfs_set(priv->fd.sysfs_bus, "../rescan", "1");
+ igt_assert_f(igt_sysfs_set(priv->fd.sysfs_bus, "../rescan", "1"),
+ "Bus rescan failure!\n");
igt_reset_timeout();
}
--
2.21.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2020-08-07 9:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-07 9:19 [igt-dev] [PATCH i-g-t v2 00/16] tests/core_hotunplug: Fixes and enhancements Janusz Krzysztofik
2020-08-07 9:19 ` [Intel-gfx] [PATCH i-g-t v2 01/16] tests/core_hotunplug: Use igt_assert_fd() Janusz Krzysztofik
2020-08-07 9:19 ` [igt-dev] [PATCH i-g-t v2 02/16] tests/core_hotunplug: Constify dev_bus_addr string Janusz Krzysztofik
2020-08-07 9:19 ` [igt-dev] [PATCH i-g-t v2 03/16] tests/core_hotunplug: Consolidate duplicated debug messages Janusz Krzysztofik
2020-08-07 9:19 ` [igt-dev] [PATCH i-g-t v2 04/16] tests/core_hotunplug: Assert successful device filter application Janusz Krzysztofik
2020-08-07 9:19 ` [Intel-gfx] [PATCH i-g-t v2 05/16] tests/core_hotunplug: Fix missing newline Janusz Krzysztofik
2020-08-07 9:19 ` [igt-dev] [PATCH i-g-t v2 06/16] tests/core_hotunplug: Maintain a single data structure instance Janusz Krzysztofik
2020-08-07 9:19 ` [igt-dev] [PATCH i-g-t v2 07/16] tests/core_hotunplug: Pass errors via a data structure field Janusz Krzysztofik
2020-08-07 9:19 ` [igt-dev] [PATCH i-g-t v2 08/16] tests/core_hotunplug: Handle device close errors Janusz Krzysztofik
2020-08-07 9:19 ` [igt-dev] [PATCH i-g-t v2 09/16] tests/core_hotunplug: Prepare invariant data once per test run Janusz Krzysztofik
2020-08-07 9:19 ` [igt-dev] [PATCH i-g-t v2 10/16] tests/core_hotunplug: Skip selectively on sysfs close errors Janusz Krzysztofik
2020-08-07 9:19 ` [igt-dev] [PATCH i-g-t v2 11/16] tests/core_hotunplug: Follow failed subtests with health checks Janusz Krzysztofik
2020-08-07 9:19 ` [igt-dev] [PATCH i-g-t v2 12/16] tests/core_hotunplug: Fail subtests on device close errors Janusz Krzysztofik
2020-08-07 9:19 ` Janusz Krzysztofik [this message]
2020-08-07 9:20 ` [Intel-gfx] [PATCH i-g-t v2 14/16] tests/core_hotunplug: Assert expected device presence/absence Janusz Krzysztofik
2020-08-07 9:20 ` [igt-dev] [PATCH i-g-t v2 15/16] tests/core_hotunplug: Explicitly ignore unused return values Janusz Krzysztofik
2020-08-07 9:20 ` [Intel-gfx] [PATCH i-g-t 16/16] tests/core_hotunplug: Un-blocklist *unbind* subtests Janusz Krzysztofik
2020-08-07 11:53 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/core_hotunplug: Fixes and enhancements (rev2) Patchwork
2020-08-07 14:08 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2020-08-10 9:33 ` [igt-dev] [PATCH i-g-t v2 00/16] tests/core_hotunplug: Fixes and enhancements Janusz Krzysztofik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200807092002.32350-14-janusz.krzysztofik@linux.intel.com \
--to=janusz.krzysztofik@linux.intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=michal.winiarski@intel.com \
--cc=petri.latvala@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox