[igt-dev] [PATCH i-g-t 1/1] tests: Remove tools_test

Petri Latvala
2018-09-12T06:53:13Z

The test is basically just testing if the tools work properly with
little relevance to testing if the kernel works properly. If the
purpose was to test the kernel (or hardware), actual tests will be
better suited for the purpose. If the purpose was to test if the tools
work, sanity checks somewhere else for all tools instead of just two
is better suited for the purpose.

In a nutshell, tools_test as such is fairly useless and has thus far
only revealed problems in testing setups (incorrect paths etc) instead
of problems in kernel or hardware.

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
tests/Makefile.sources | 1 -
tests/meson.build | 1 -
tests/tools_test.c | 143 -----------------------------------------
3 files changed, 145 deletions(-)
delete mode 100644 tests/tools_test.c

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index c84933f1..59a9d51f 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -227,7 +227,6 @@ TESTS_progs = \
syncobj_basic \
syncobj_wait \
template \
- tools_test \
vgem_basic \
vgem_slow \
$(NULL)
diff --git a/tests/meson.build b/tests/meson.build
index 17deb945..f31dc29b 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -201,7 +201,6 @@ test_progs = [
'syncobj_basic',
'syncobj_wait',
'template',
- 'tools_test',
'vc4_create_bo',
'vc4_dmabuf_poll',
'vc4_label_bo',
diff --git a/tests/tools_test.c b/tests/tools_test.c
deleted file mode 100644
index a0025bed..00000000
--- a/tests/tools_test.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * 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.
- */
-#include "config.h"
-#include "igt.h"
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <unistd.h>
-
-#define TOOLS "../tools/"
-
-struct line_check {
- int found;
- const char *substr;
-};
-
-/**
- * Our igt_log_buffer_inspect handler. Checks the output of the
- * intel_l3_parity tool and increments line_check::found if a specific
- * substring is found.
- */
-static bool check_cmd_output(const char *line, void *data)
-{
- struct line_check *check = data;
-
- if (strstr(line, check->substr)) {
- check->found++;
- }
-
- return false;
-}
-
-static void assert_cmd_success(int exec_return)
-{
- igt_skip_on_f(exec_return == IGT_EXIT_SKIP,
- "intel_l3_parity not supported\n");
- igt_assert_eq(exec_return, IGT_EXIT_SUCCESS);
-}
-
-igt_main
-{
- igt_skip_on_simulation();
-
- igt_fixture {
- char path[4096];
-
- /* Try to guess where the TOOLS are! */
- if (access(TOOLS, F_OK) &&
- readlink("/proc/self/exe", path, sizeof(path)) > 0)
- chdir(dirname(path));
-
- igt_require_f(chdir(TOOLS) == 0,
- "Unable to determine the tools directory, expecting them in $cwd/" TOOLS " or $path/" TOOLS "\n");
- }
-
- igt_subtest("sysfs_l3_parity") {
- int exec_return;
- struct line_check line;
-
- igt_require(access("intel_l3_parity", X_OK) == 0);
-
- /* Sanity check that l3 parity tool is usable: Enable
- * row,bank,subbank 0,0,0.
- *
- * TODO: Better way to find intel_l3_parity. This path
- * is relative to piglit's path, when run through
- * piglit.
- */
- igt_system_cmd(exec_return,
- "./intel_l3_parity -r 0 -b 0 "
- "-s 0 -e");
- assert_cmd_success(exec_return);
-
- /* Disable row,bank,subbank 0,0,0. */
- igt_system_cmd(exec_return,
- "./intel_l3_parity -r 0 -b 0 "
- "-s 0 -d");
- assert_cmd_success(exec_return);
-
- /* Check that disabling was successful */
- igt_system_cmd(exec_return,
- "./intel_l3_parity -l");
- assert_cmd_success(exec_return);
- line.substr = "Row 0, Bank 0, Subbank 0 is disabled";
- line.found = 0;
- igt_log_buffer_inspect(check_cmd_output, &line);
- igt_assert_eq(line.found, 1);
-
- /* Re-enable row,bank,subbank 0,0,0 */
- igt_system_cmd(exec_return,
- "./intel_l3_parity -r 0 -b 0 "
- "-s 0 -e");
- assert_cmd_success(exec_return);
-
- /* Check that re-enabling was successful:
- * intel_l3_parity -l should now not print that Row 0,
- * Bank 0, Subbank 0 is disabled.
- *
- * The previously printed line is already in the log
- * buffer so we check for count 1.
- */
- igt_system_cmd(exec_return,
- "./intel_l3_parity -l");
- assert_cmd_success(exec_return);
- line.substr = "Row 0, Bank 0, Subbank 0 is disabled";
- line.found = 0;
- igt_log_buffer_inspect(check_cmd_output,
- &line);
- igt_assert_eq(line.found, 1);
- }
-
- igt_subtest("tools_test") {
- igt_require(access("intel_reg", X_OK) == 0);
-
- igt_assert_eq(igt_system_quiet("./intel_reg read 0x4030"),
- IGT_EXIT_SUCCESS);
-
- igt_assert_eq(igt_system_quiet("./intel_reg dump"),
- IGT_EXIT_SUCCESS);
- }
-}
--
2.18.0