diff options
| -rw-r--r-- | lib/igt_debugfs.c | 13 | ||||
| -rw-r--r-- | lib/igt_debugfs.h | 2 | ||||
| -rw-r--r-- | tests/gem_reset_stats.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c index 32edc435..9c4c989c 100644 --- a/lib/igt_debugfs.c +++ b/lib/igt_debugfs.c @@ -37,7 +37,7 @@ /* * General debugfs helpers */ -int igt_debugfs_init(igt_debugfs_t *debugfs) +void igt_debugfs_init(igt_debugfs_t *debugfs) { const char *path = "/sys/kernel/debug"; struct stat st; @@ -51,11 +51,9 @@ int igt_debugfs_init(igt_debugfs_t *debugfs) if (stat("/sys/kernel/debug/dri", &st) == 0) goto find_minor; - if (stat("/sys/kernel/debug", &st)) - return errno; + igt_assert(stat("/sys/kernel/debug", &st) == 0); - if (mount("debug", "/sys/kernel/debug", "debugfs", 0, 0)) - return errno; + igt_assert(mount("debug", "/sys/kernel/debug", "debugfs", 0, 0) == 0); find_minor: strcpy(debugfs->root, path); @@ -64,12 +62,13 @@ find_minor: sprintf(debugfs->dri_path + len, "/i915_error_state"); if (stat(debugfs->dri_path, &st) == 0) { debugfs->dri_path[len] = '\0'; - return 0; + return; } } debugfs->dri_path[0] = '\0'; - return ENOENT; + + igt_fail(4); } int igt_debugfs_open(igt_debugfs_t *debugfs, const char *filename, int mode) diff --git a/lib/igt_debugfs.h b/lib/igt_debugfs.h index 43fa0fc5..5f940cb2 100644 --- a/lib/igt_debugfs.h +++ b/lib/igt_debugfs.h @@ -36,7 +36,7 @@ typedef struct { char dri_path[128]; } igt_debugfs_t; -int igt_debugfs_init(igt_debugfs_t *debugfs); +void igt_debugfs_init(igt_debugfs_t *debugfs); int igt_debugfs_open(igt_debugfs_t *debugfs, const char *filename, int mode); FILE *igt_debugfs_fopen(igt_debugfs_t *debugfs, const char *filename, const char *mode); diff --git a/tests/gem_reset_stats.c b/tests/gem_reset_stats.c index a7d6550d..71ba6dfe 100644 --- a/tests/gem_reset_stats.c +++ b/tests/gem_reset_stats.c @@ -1041,7 +1041,7 @@ igt_main "Kernel is too old, or contexts not supported: %s\n", strerror(errno)); - assert(igt_debugfs_init(&dfs) == 0); + igt_debugfs_init(&dfs); } igt_subtest("params") |