On Thu, Apr 20, 2017 at 11:13:48AM +0300, Abdiel Janulgue wrote:
> Converted:
> - check_drm_clients (ensures no other clients are running.
> functionality provided by drm_open_driver_master).
> - debugfs_emon_crash
> - debugfs_wedged
> - drv_debugfs_reader
> - sysfs_l3_parity
> - test_rte_check (same as check_drm_clients)
> - tools_test
> - ZZ_check_dmesg
>
> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
> Cc: Petri Latvala <petri.latvala@xxxxxxxxx>
> Signed-off-by: Abdiel Janulgue <abdiel.janulgue@xxxxxxxxxxxxxxx>
> ---
> tests/Makefile.sources | 9 +---
> tests/ZZ_check_dmesg | 11 -----
> tests/check_drm_clients | 6 ---
> tests/debugfs.c | 75 ++++++++++++++++++++++++++++++++
> tests/debugfs_emon_crash | 16 -------
> tests/debugfs_wedged | 10 -----
> tests/drv_debugfs_reader | 9 ----
> tests/sysfs_l3_parity | 22 ----------
> tests/test_rte_check | 6 ---
> tests/tools.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++
> tests/tools_test | 16 -------
> 11 files changed, 188 insertions(+), 103 deletions(-)
> delete mode 100755 tests/ZZ_check_dmesg
> delete mode 100755 tests/check_drm_clients
> create mode 100644 tests/debugfs.c
> delete mode 100755 tests/debugfs_emon_crash
> delete mode 100755 tests/debugfs_wedged
> delete mode 100755 tests/drv_debugfs_reader
> delete mode 100755 tests/sysfs_l3_parity
> delete mode 100755 tests/test_rte_check
> create mode 100644 tests/tools.c
> delete mode 100755 tests/tools_test
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 7fa9b8f..089428d 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -234,6 +234,8 @@ TESTS_progs = \
> drv_module_reload \
> kms_sysfs_edid_timing \
> perf \
> + debugfs \
> + tools \
> $(NULL)
>
> # IMPORTANT: The ZZ_ tests need to be run last!
> @@ -242,11 +244,6 @@ TESTS_scripts_M = \
> $(NULL)
>
> TESTS_scripts = \
> - debugfs_emon_crash \
> - drv_debugfs_reader \
> - sysfs_l3_parity \
> - test_rte_check \
> - tools_test \
> $(NULL)
>
> # This target contains testcases which support automagic subtest enumeration
> @@ -308,9 +305,7 @@ HANG = \
> $(NULL)
>
> scripts = \
> - check_drm_clients \
> ddx_intel_after_fbdev \
> - debugfs_wedged \
> drm_lib.sh \
> drm_getopt.sh \
> $(NULL)
> diff --git a/tests/ZZ_check_dmesg b/tests/ZZ_check_dmesg
> deleted file mode 100755
> index e28ba35..0000000
> --- a/tests/ZZ_check_dmesg
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#!/bin/sh
> -
> -if dmesg | grep '\*ERROR\*' > /dev/null ; then
> - echo "DRM_ERROR dirt in dmesg"
> - exit 1
> -fi
> -
> -if dmesg | grep -- '------\[ cut here \]----' > /dev/null ; then
> - echo "found a backtrace in dmesg"
> - exit 1
> -fi
> diff --git a/tests/check_drm_clients b/tests/check_drm_clients
> deleted file mode 100755
> index 2a891b8..0000000
> --- a/tests/check_drm_clients
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#!/bin/bash
> -
> -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
> -. $SOURCE_DIR/drm_lib.sh
> -
> -exit $IGT_EXIT_SUCCESS
> diff --git a/tests/debugfs.c b/tests/debugfs.c
> new file mode 100644
> index 0000000..2e2f9bb
> --- /dev/null
> +++ b/tests/debugfs.c
> @@ -0,0 +1,75 @@
> +/*
> + * Copyright © 2017 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + */
> +#ifdef HAVE_CONFIG_H
> +#include "config.h"
> +#endif
> +#include "igt.h"
> +
> +igt_main
> +{
> + int fd = -1;
> + igt_skip_on_simulation();
> +
> + igt_fixture {
> + fd = drm_open_driver_master(DRIVER_INTEL);
> + igt_require_gem(fd);
> + }
> +
> + igt_subtest_group {
> + igt_subtest("debugfs_emon_crash") {
These subtest names lead to redundant naming. This one for example
becomes igt@debugfs@debugfs_emon_crash.
> + int i;
> + char *cmd;
> + igt_assert(asprintf(&cmd, "cat %s/i915_emon_status",
> + igt_debugfs_path(fd)) != -1);
> +
> + for (i = 0; i < 1000; i++)
> + igt_exec_quiet(cmd);
When converted to C, there's really no reason to keep using cat to
read the file here.
> +
> + free(cmd);
> + }
> +
> + igt_subtest("debugfs_wedged") {
> + char *c1, *c2;
> + igt_assert(asprintf(&c1, "echo 1 > %s/i915_wedged",
> + igt_debugfs_path(fd)) != -1);
> + igt_assert(asprintf(&c2, "cat %s/i915_error_state",
> + igt_debugfs_path(fd)) != -1);
> + igt_exec(c1);
> + igt_exec_quiet(c2);
Same here. This could also use some documentation to explain _how_
this test behaves on a working kernel and a broken kernel. AFAICS it's
the reading of i915_error_state file that explodes on a broken kernel,
reported by the original script by the magic of the 'cat' of
i915_error_state being the last command in the script? This C version
doesn't check whether the reading of the file succeeds.
> + free(c1);
> + free(c2);
> + }
> +
> + igt_subtest("drv_debugfs_reader") {
> + char *cmd;
> + igt_assert(asprintf(&cmd, "cat %s/*",
> + igt_debugfs_path(fd)) != -1);
> + igt_exec_quiet(cmd);
Same cat comment here.
> + free(cmd);
> + }
> + }
> +
> + igt_fixture {
> + close(fd);
> + }
> +}
> diff --git a/tests/debugfs_emon_crash b/tests/debugfs_emon_crash
> deleted file mode 100755
> index 1dbfcb2..0000000
> --- a/tests/debugfs_emon_crash
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -#!/bin/bash
> -#
> -# This check if we can crash the kernel with segmentation-fault
> -# by reading /sys/kernel/debug/dri/0/i915_emon_status too quickly
> -#
> -
> -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
> -. $SOURCE_DIR/drm_lib.sh
> -
> -for z in $(seq 1 1000); do
> - cat $i915_dfs_path/i915_emon_status > /dev/null 2&>1
> -done
> -
> -# If we got here, we haven't crashed
> -
> -exit $IGT_EXIT_SUCCESS
> diff --git a/tests/debugfs_wedged b/tests/debugfs_wedged
> deleted file mode 100755
> index f15ac46..0000000
> --- a/tests/debugfs_wedged
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -#!/bin/bash
> -
> -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
> -. $SOURCE_DIR/drm_lib.sh
> -
> -# Testcase: wedge the hw to check the error_state reading
> -#
> -# Unfortunately wedged is permanent, so this test is not run by default
> -echo 1 > ${i915_dfs_path}/i915_wedged
> -cat $i915_dfs_path/i915_error_state > /dev/null 2>&1
> diff --git a/tests/drv_debugfs_reader b/tests/drv_debugfs_reader
> deleted file mode 100755
> index 6ea4e64..0000000
> --- a/tests/drv_debugfs_reader
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -#!/bin/bash
> -
> -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
> -. $SOURCE_DIR/drm_lib.sh
> -
> -# read everything we can
> -cat $i915_dfs_path/* > /dev/null 2>&1
> -
> -exit $IGT_EXIT_SUCCESS
> diff --git a/tests/sysfs_l3_parity b/tests/sysfs_l3_parity
> deleted file mode 100755
> index d5f3284..0000000
> --- a/tests/sysfs_l3_parity
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -#!/bin/bash
> -
> -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
> -. $SOURCE_DIR/drm_lib.sh
> -
> -$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -e || exit $?
> -
> -#Check that we can remap a row
> -$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -d
> -disabled=`$SOURCE_DIR/../tools/intel_l3_parity -l | grep -c 'Row 0, Bank 0, Subbank 0 is disabled'`
> -if [ "$disabled" != "1" ] ; then
> - echo "Fail"
> - exit $IGT_EXIT_FAILURE
> -fi
> -
> -$SOURCE_DIR/../tools/intel_l3_parity -r 0 -b 0 -s 0 -e
> -
> -#Check that we can clear remaps
> -if [ `$SOURCE_DIR/../tools/intel_l3_parity -l | wc -l` != 1 ] ; then
> - echo "Fail 2"
> - exit $IGT_EXIT_FAILURE
> -fi
> diff --git a/tests/test_rte_check b/tests/test_rte_check
> deleted file mode 100755
> index 2a891b8..0000000
> --- a/tests/test_rte_check
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -#!/bin/bash
> -
> -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
> -. $SOURCE_DIR/drm_lib.sh
> -
> -exit $IGT_EXIT_SUCCESS
> diff --git a/tests/tools.c b/tests/tools.c
> new file mode 100644
> index 0000000..5fc784c
> --- /dev/null
> +++ b/tests/tools.c
> @@ -0,0 +1,111 @@
> +/*
> + * Copyright © 2017 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + */
> +#ifdef HAVE_CONFIG_H
> +#include "config.h"
> +#endif
> +#include "igt.h"
> +#include <stdio.h>
> +
> +/**
> + * Parse the r-value of a [cmd] string.
> + */
> +static bool check_cmd_return_value(const char *s, void *data)
> +{
> + int *val = data;
> + char *cmd, *found;
> + const char *delim = "[cmd]";
> + const int delim_len = strlen(delim);
> +
> + if (!(cmd = strstr(s, delim)))
> + return false;
> +
> + found = cmd + delim_len + 1;
> + igt_assert(delim_len + strlen(found) < strlen(cmd));
> +
> + *val = atoi(found);
> + return true;
> +}
> +
> +igt_main
> +{
> + int fd = -1;
> + igt_skip_on_simulation();
> +
> + igt_fixture {
> + /* Just make sure no other drm clients are running */
> + fd = drm_open_driver_master(DRIVER_INTEL);
> + igt_require_gem(fd);
> + close(fd);
> + }
> +
> + igt_subtest_group {
> + igt_subtest("sysfs_l3_parity") {
> + char *cmd;
> + int exec_return;
> +
> + igt_assert(asprintf(&cmd,
> + "../tools/intel_l3_parity -l | "
> + "grep -c 'Row 0, Bank 0, Subbank 0 "
> + "is disabled'"));
> + exec_return = igt_exec(cmd);
> + free(cmd);
> + if (exec_return == IGT_EXIT_SUCCESS) {
> + int val = -1;
> + igt_log_buffer_inspect(check_cmd_return_value,
> + &val);
> + igt_assert(val == 1);
> + } else {
> + igt_fail(IGT_EXIT_FAILURE);
> + }
> + }
> +
> + igt_subtest("tools_test") {
> + char *cmd;
> +
> + igt_assert(asprintf(&cmd,
> + "../tools/intel_reg read 0x4030")
> + != -1);
> + igt_assert(igt_exec_quiet(cmd) == IGT_EXIT_SUCCESS);
> + free(cmd);
> +
> + igt_assert(asprintf(&cmd, "../tools/intel_reg dump")
> + != -1);
intel_reg can be used without i915.ko loaded, but the fixture above
requires it.
--
Petri Latvala
> + igt_assert(igt_exec_quiet(cmd) == IGT_EXIT_SUCCESS);
> + free(cmd);
> + }
> +
> + igt_subtest("ZZ_check_dmesg") {
> + char *cmd;
> + igt_assert(asprintf(&cmd, "dmesg | grep '\\*ERROR\\*'")
> + != -1);
> + igt_assert(igt_exec_quiet(cmd) != IGT_EXIT_SUCCESS);
> + free(cmd);
> +
> + igt_assert(asprintf(&cmd, "dmesg | grep "
> + "-- '------\\[ cut here \\]----'")
> + != -1);
> + igt_assert(igt_exec_quiet(cmd) != IGT_EXIT_SUCCESS);
> + free(cmd);
> + }
> + }
> +}
> diff --git a/tests/tools_test b/tests/tools_test
> deleted file mode 100755
> index a27fb87..0000000
> --- a/tests/tools_test
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -#!/bin/bash
> -# Test some of the most critical tools we have accidentally broken before.
> -# TODO: Possibly make tests parse output
> -
> -SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
> -. $SOURCE_DIR/drm_lib.sh
> -
> -# ARB_MODE has existed for many gens
> -PATH=$SOURCE_DIR/../tools:$PATH
> -do_or_die "intel_reg read 0x4030"
> -do_or_die "intel_reg dump"
> -
> -# TODO: Add more tests
> -
> -exit $IGT_EXIT_SUCCESS
> -
> --
> 2.7.4
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
