Again they're not really igt testcases so are in the way of
running spatch unconditionally. Move them someplace else.
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
---
configure.ac | 1 +
lib/Makefile.am | 2 +
lib/tests/.gitignore | 7 ++
lib/tests/Makefile.am | 18 +++++
lib/tests/Makefile.sources | 29 +++++++
lib/tests/igt_command_line.sh | 61 ++++++++++++++
lib/tests/igt_fork_helper.c | 37 +++++++++
lib/tests/igt_list_only.c | 42 ++++++++++
lib/tests/igt_no_exit.c | 39 +++++++++
lib/tests/igt_no_exit_list_only.c | 40 ++++++++++
lib/tests/igt_no_subtest.c | 38 +++++++++
lib/tests/igt_simulation.c | 164 ++++++++++++++++++++++++++++++++++++++
tests/.gitignore | 6 --
tests/Makefile.am | 4 +-
tests/Makefile.sources | 18 -----
tests/igt_command_line.sh | 61 --------------
tests/igt_fork_helper.c | 37 ---------
tests/igt_list_only.c | 42 ----------
tests/igt_no_exit.c | 39 ---------
tests/igt_no_exit_list_only.c | 40 ----------
tests/igt_no_subtest.c | 38 ---------
tests/igt_simulation.c | 164 --------------------------------------
22 files changed, 480 insertions(+), 447 deletions(-)
create mode 100644 lib/tests/.gitignore
create mode 100644 lib/tests/Makefile.am
create mode 100644 lib/tests/Makefile.sources
create mode 100755 lib/tests/igt_command_line.sh
create mode 100644 lib/tests/igt_fork_helper.c
create mode 100644 lib/tests/igt_list_only.c
create mode 100644 lib/tests/igt_no_exit.c
create mode 100644 lib/tests/igt_no_exit_list_only.c
create mode 100644 lib/tests/igt_no_subtest.c
create mode 100644 lib/tests/igt_simulation.c
delete mode 100755 tests/igt_command_line.sh
delete mode 100644 tests/igt_fork_helper.c
delete mode 100644 tests/igt_list_only.c
delete mode 100644 tests/igt_no_exit.c
delete mode 100644 tests/igt_no_exit_list_only.c
delete mode 100644 tests/igt_no_subtest.c
delete mode 100644 tests/igt_simulation.c
diff --git a/configure.ac b/configure.ac
index 03e856dd7f58..d3faa19a5cf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,6 +216,7 @@ AC_CONFIG_FILES([
docs/reference/intel-gpu-tools/Makefile
docs/reference/intel-gpu-tools/version.xml
lib/Makefile
+ lib/tests/Makefile
man/Makefile
scripts/Makefile
tests/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 36cf2d3fe6e2..6b1e984c84a0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,8 @@
IGT_LIB_PATH := $(builddir)
GPU_TOOLS_PATH := $(top_srcdir)
+SUBDIRS = tests
+
include Makefile.sources
noinst_LTLIBRARIES = libintel_tools.la
diff --git a/lib/tests/.gitignore b/lib/tests/.gitignore
new file mode 100644
index 000000000000..caf53482de76
--- /dev/null
+++ b/lib/tests/.gitignore
@@ -0,0 +1,7 @@
+# Please keep sorted alphabetically
+igt_fork_helper
+igt_list_only
+igt_no_exit
+igt_no_exit_list_only
+igt_no_subtest
+igt_simulation
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
new file mode 100644
index 000000000000..808d31f2f8c6
--- /dev/null
+++ b/lib/tests/Makefile.am
@@ -0,0 +1,18 @@
+include Makefile.sources
+
+EXTRA_PROGRAMS = $(TESTS_testsuite)
+EXTRA_DIST = $(TESTS_scripts)
+
+CLEANFILES = $(EXTRA_PROGRAMS)
+
+AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \
+ -I$(srcdir)/../.. \
+ -I$(srcdir)/.. \
+ -include "$(srcdir)/../../lib/check-ndebug.h" \
+ -DIGT_DATADIR=\""$(abs_srcdir)"\" \
+ $(NULL)
+
+LDADD = ../libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS)
+
+LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS)
+AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS)
diff --git a/lib/tests/Makefile.sources b/lib/tests/Makefile.sources
new file mode 100644
index 000000000000..b13314dec865
--- /dev/null
+++ b/lib/tests/Makefile.sources
@@ -0,0 +1,29 @@
+noinst_PROGRAMS = \
+ $(TESTS_testsuite) \
+ $(NULL)
+
+TESTS_testsuite = \
+ igt_no_exit \
+ igt_no_exit_list_only \
+ igt_fork_helper \
+ igt_list_only \
+ igt_no_subtest \
+ igt_simulation \
+ $(NULL)
+
+TESTS_testsuite_scripts = \
+ igt_command_line.sh \
+ $(NULL)
+
+TESTS = \
+ $(TESTS_testsuite) \
+ $(TESTS_testsuite_scripts) \
+ $(NULL)
+
+# Test that exercise specific asserts in the test framework library and are
+# hence expected to fail.
+XFAIL_TESTS = \
+ igt_no_exit \
+ igt_no_exit_list_only \
+ igt_no_subtest \
+ $(NULL)
diff --git a/lib/tests/igt_command_line.sh b/lib/tests/igt_command_line.sh
new file mode 100755
index 000000000000..075f1d5349c0
--- /dev/null
+++ b/lib/tests/igt_command_line.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# Copyright © 2014 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.
+
+#
+# Check that command line handling works consistently across all tests
+#
+
+for test in `cat single-tests.txt multi-tests.txt`; do
+
+ if [ "$test" = "TESTLIST" -o "$test" = "END" ]; then
+ continue
+ fi
+
+ # if the test is a script, it will be in $srcdir
+ if [ ! -x $test ]; then
+ if [ -x $srcdir/$test ]; then
+ test=$srcdir/$test
+ fi
+ fi
+
+ echo "$test:"
+
+ # check invalid option handling
+ echo " Checking invalid option handling..."
+ ./$test --invalid-option 2> /dev/null && exit 99
+
+ # check valid options succeed
+ echo " Checking valid option handling..."
+ ./$test --help > /dev/null || exit 99
+
+ # check --list-subtests works correctly
+ echo " Checking subtest enumeration..."
+ ./$test --list-subtests > /dev/null
+ if [ $? -ne 0 -a $? -ne 79 ]; then
+ exit 99
+ fi
+
+ # check invalid subtest handling
+ echo " Checking invalid subtest handling..."
+ ./$test --run-subtest invalid-subtest > /dev/null 2>&1 && exit 99
+done
diff --git a/lib/tests/igt_fork_helper.c b/lib/tests/igt_fork_helper.c
new file mode 100644
index 000000000000..b4cf27eb5a47
--- /dev/null
+++ b/lib/tests/igt_fork_helper.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2013 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.
+ *
+ * Authors:
+ * Daniel Vetter <daniel.vetter@xxxxxxxx>
+ *
+ */
+
+#include "drmtest.h"
+#include "igt_aux.h"
+
+int main(int argc, char **argv)
+{
+ for (int i = 0; i < 1000; i++) {
+ igt_fork_signal_helper();
+ igt_stop_signal_helper();
+ }
+}
diff --git a/lib/tests/igt_list_only.c b/lib/tests/igt_list_only.c
new file mode 100644
index 000000000000..d3ea8c27453c
--- /dev/null
+++ b/lib/tests/igt_list_only.c
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2013 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.
+ *
+ * Authors:
+ * Daniel Vetter <daniel.vetter@xxxxxxxx>
+ *
+ */
+
+#include "drmtest.h"
+
+int main(int argc, char **argv)
+{
+ char prog[] = "igt_list_only";
+ char arg[] = "--list-subtests";
+ char *fake_argv[] = {prog, arg};
+
+ igt_subtest_init(2, fake_argv);
+
+ igt_subtest("A")
+ ;
+
+ igt_exit();
+}
diff --git a/lib/tests/igt_no_exit.c b/lib/tests/igt_no_exit.c
new file mode 100644
index 000000000000..ba3fae0ae94d
--- /dev/null
+++ b/lib/tests/igt_no_exit.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2013 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.
+ *
+ * Authors:
+ * Daniel Vetter <daniel.vetter@xxxxxxxx>
+ *
+ */
+
+#include "drmtest.h"
+
+int main(int argc, char **argv)
+{
+ char prog[] = "igt_no_exit";
+ char *fake_argv[] = {prog};
+
+ igt_subtest_init(1, fake_argv);
+
+ igt_subtest("A")
+ ;
+}
diff --git a/lib/tests/igt_no_exit_list_only.c b/lib/tests/igt_no_exit_list_only.c
new file mode 100644
index 000000000000..3b232be70e31
--- /dev/null
+++ b/lib/tests/igt_no_exit_list_only.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2013 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.
+ *
+ * Authors:
+ * Daniel Vetter <daniel.vetter@xxxxxxxx>
+ *
+ */
+
+#include "drmtest.h"
+
+int main(int argc, char **argv)
+{
+ char prog[] = "igt_list_only";
+ char arg[] = "--list-subtests";
+ char *fake_argv[] = {prog, arg};
+
+ igt_subtest_init(2, fake_argv);
+
+ igt_subtest("A")
+ ;
+}
diff --git a/lib/tests/igt_no_subtest.c b/lib/tests/igt_no_subtest.c
new file mode 100644
index 000000000000..47f15fce8343
--- /dev/null
+++ b/lib/tests/igt_no_subtest.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2013 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.
+ *
+ * Authors:
+ * Daniel Vetter <daniel.vetter@xxxxxxxx>
+ *
+ */
+
+#include "drmtest.h"
+
+int main(int argc, char **argv)
+{
+ char prog[] = "igt_no_exit";
+ char *fake_argv[] = {prog};
+
+ igt_subtest_init(1, fake_argv);
+
+ igt_exit();
+}
diff --git a/lib/tests/igt_simulation.c b/lib/tests/igt_simulation.c
new file mode 100644
index 000000000000..e58895901924
--- /dev/null
+++ b/lib/tests/igt_simulation.c
@@ -0,0 +1,164 @@
+/*
+ * Copyright © 2014 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.
+ *
+ * Authors:
+ * Daniel Vetter <daniel.vetter@xxxxxxxx>
+ *
+ */
+
+#include <stdlib.h>
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <assert.h>
+#include <errno.h>
+
+#include "drmtest.h"
+#include "igt_core.h"
+
+/*
+ * We need to hide assert from the cocci igt test refactor spatch.
+ *
+ * IMPORTANT: Test infrastructure tests are the only valid places where using
+ * assert is allowed.
+ */
+#define internal_assert assert
+
+bool simple;
+bool list_subtests;
+bool in_fixture;
+bool in_subtest;
+
+char test[] = "test";
+char list[] = "--list-subtests";
+char *argv_list[] = { test, list };
+char *argv_run[] = { test };
+
+static int do_fork(void)
+{
+ int pid, status;
+
+ switch (pid = fork()) {
+ case -1:
+ internal_assert(0);
+ case 0:
+ if (simple) {
+ igt_simple_init(1, argv_run);
+
+ igt_skip_on_simulation();
+
+ igt_exit();
+ } else {
+ if (list_subtests)
+ igt_subtest_init(2, argv_list);
+ else
+ igt_subtest_init(1, argv_run);
+
+ if (in_fixture) {
+ igt_fixture
+ igt_skip_on_simulation();
+ } if (in_subtest) {
+ igt_subtest("sim")
+ igt_skip_on_simulation();
+ } else
+ igt_skip_on_simulation();
+
+ if (!in_subtest)
+ igt_subtest("foo")
+ ;
+
+ igt_exit();
+ }
+ default:
+ while (waitpid(pid, &status, 0) == -1 &&
+ errno == EINTR)
+ ;
+
+ internal_assert(WIFEXITED(status));
+
+ return WEXITSTATUS(status);
+ }
+}
+
+int main(int argc, char **argv)
+{
+ /* simple tests */
+ simple = true;
+ internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SKIP);
+
+ internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+
+ /* subtests, list mode */
+ simple = false;
+ list_subtests = true;
+
+ in_fixture = false;
+ internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+
+ internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+
+ in_fixture = true;
+ internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+
+ internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+
+ in_fixture = false;
+ in_subtest = true;
+ internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+
+ internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+
+ /* subtest, run mode */
+ simple = false;
+ list_subtests = false;
+
+ in_fixture = false;
+ internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SKIP);
+
+ internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+
+ in_fixture = true;
+ internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SKIP);
+
+ internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+
+ in_fixture = false;
+ in_subtest = true;
+ internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SKIP);
+
+ internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
+ internal_assert(do_fork() == IGT_EXIT_SUCCESS);
+
+ return 0;
+}
diff --git a/tests/.gitignore b/tests/.gitignore
index b8562b62cc14..da8b41701b53 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -112,12 +112,6 @@ gen3_render_mixed_blits
gen3_render_tiledx_blits
gen3_render_tiledy_blits
gen7_forcewake_mt
-igt_fork_helper
-igt_list_only
-igt_no_exit
-igt_no_exit_list_only
-igt_no_subtest
-igt_simulation
kms_3d
kms_addfb
kms_cursor_crc
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5734002a3b2a..889333beabb1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,8 +27,8 @@ multi-tests.txt: Makefile.sources
@echo ${multi_kernel_tests} >> $@
@echo END TESTLIST >> $@
-EXTRA_PROGRAMS = $(TESTS_progs) $(TESTS_progs_M) $(HANG) $(TESTS_testsuite)
-EXTRA_DIST = $(TESTS_scripts) $(TESTS_scripts_M) $(scripts) $(IMAGES) $(common_files)
+EXTRA_PROGRAMS = $(TESTS_progs) $(TESTS_progs_M) $(HANG)
+EXTRA_DIST = $(TESTS_scripts_M) $(scripts) $(IMAGES) $(common_files)
CLEANFILES = $(EXTRA_PROGRAMS) single-tests.txt multi-tests.txt
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 7724a734bed0..ec35004705ac 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -191,24 +191,6 @@ kernel_tests = \
$(multi_kernel_tests) \
$(NULL)
-TESTS_testsuite = \
- igt_no_exit \
- igt_no_exit_list_only \
- igt_fork_helper \
- igt_list_only \
- igt_no_subtest \
- igt_simulation \
- $(NULL)
-
-TESTS_testsuite_scripts = \
- igt_command_line.sh \
- $(NULL)
-
-TESTS = \
- $(TESTS_testsuite) \
- $(TESTS_testsuite_scripts) \
- $(NULL)
-
# Test that exercise specific asserts in the test framework library and are
# hence expected to fail.
XFAIL_TESTS = \
diff --git a/tests/igt_command_line.sh b/tests/igt_command_line.sh
deleted file mode 100755
index 075f1d5349c0..000000000000
--- a/tests/igt_command_line.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# Copyright © 2014 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.
-
-#
-# Check that command line handling works consistently across all tests
-#
-
-for test in `cat single-tests.txt multi-tests.txt`; do
-
- if [ "$test" = "TESTLIST" -o "$test" = "END" ]; then
- continue
- fi
-
- # if the test is a script, it will be in $srcdir
- if [ ! -x $test ]; then
- if [ -x $srcdir/$test ]; then
- test=$srcdir/$test
- fi
- fi
-
- echo "$test:"
-
- # check invalid option handling
- echo " Checking invalid option handling..."
- ./$test --invalid-option 2> /dev/null && exit 99
-
- # check valid options succeed
- echo " Checking valid option handling..."
- ./$test --help > /dev/null || exit 99
-
- # check --list-subtests works correctly
- echo " Checking subtest enumeration..."
- ./$test --list-subtests > /dev/null
- if [ $? -ne 0 -a $? -ne 79 ]; then
- exit 99
- fi
-
- # check invalid subtest handling
- echo " Checking invalid subtest handling..."
- ./$test --run-subtest invalid-subtest > /dev/null 2>&1 && exit 99
-done
diff --git a/tests/igt_fork_helper.c b/tests/igt_fork_helper.c
deleted file mode 100644
index b4cf27eb5a47..000000000000
--- a/tests/igt_fork_helper.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright © 2013 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.
- *
- * Authors:
- * Daniel Vetter <daniel.vetter@xxxxxxxx>
- *
- */
-
-#include "drmtest.h"
-#include "igt_aux.h"
-
-int main(int argc, char **argv)
-{
- for (int i = 0; i < 1000; i++) {
- igt_fork_signal_helper();
- igt_stop_signal_helper();
- }
-}
diff --git a/tests/igt_list_only.c b/tests/igt_list_only.c
deleted file mode 100644
index d3ea8c27453c..000000000000
--- a/tests/igt_list_only.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright © 2013 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.
- *
- * Authors:
- * Daniel Vetter <daniel.vetter@xxxxxxxx>
- *
- */
-
-#include "drmtest.h"
-
-int main(int argc, char **argv)
-{
- char prog[] = "igt_list_only";
- char arg[] = "--list-subtests";
- char *fake_argv[] = {prog, arg};
-
- igt_subtest_init(2, fake_argv);
-
- igt_subtest("A")
- ;
-
- igt_exit();
-}
diff --git a/tests/igt_no_exit.c b/tests/igt_no_exit.c
deleted file mode 100644
index ba3fae0ae94d..000000000000
--- a/tests/igt_no_exit.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright © 2013 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.
- *
- * Authors:
- * Daniel Vetter <daniel.vetter@xxxxxxxx>
- *
- */
-
-#include "drmtest.h"
-
-int main(int argc, char **argv)
-{
- char prog[] = "igt_no_exit";
- char *fake_argv[] = {prog};
-
- igt_subtest_init(1, fake_argv);
-
- igt_subtest("A")
- ;
-}
diff --git a/tests/igt_no_exit_list_only.c b/tests/igt_no_exit_list_only.c
deleted file mode 100644
index 3b232be70e31..000000000000
--- a/tests/igt_no_exit_list_only.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright © 2013 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.
- *
- * Authors:
- * Daniel Vetter <daniel.vetter@xxxxxxxx>
- *
- */
-
-#include "drmtest.h"
-
-int main(int argc, char **argv)
-{
- char prog[] = "igt_list_only";
- char arg[] = "--list-subtests";
- char *fake_argv[] = {prog, arg};
-
- igt_subtest_init(2, fake_argv);
-
- igt_subtest("A")
- ;
-}
diff --git a/tests/igt_no_subtest.c b/tests/igt_no_subtest.c
deleted file mode 100644
index 47f15fce8343..000000000000
--- a/tests/igt_no_subtest.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright © 2013 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.
- *
- * Authors:
- * Daniel Vetter <daniel.vetter@xxxxxxxx>
- *
- */
-
-#include "drmtest.h"
-
-int main(int argc, char **argv)
-{
- char prog[] = "igt_no_exit";
- char *fake_argv[] = {prog};
-
- igt_subtest_init(1, fake_argv);
-
- igt_exit();
-}
diff --git a/tests/igt_simulation.c b/tests/igt_simulation.c
deleted file mode 100644
index e58895901924..000000000000
--- a/tests/igt_simulation.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright © 2014 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.
- *
- * Authors:
- * Daniel Vetter <daniel.vetter@xxxxxxxx>
- *
- */
-
-#include <stdlib.h>
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-
-#include "drmtest.h"
-#include "igt_core.h"
-
-/*
- * We need to hide assert from the cocci igt test refactor spatch.
- *
- * IMPORTANT: Test infrastructure tests are the only valid places where using
- * assert is allowed.
- */
-#define internal_assert assert
-
-bool simple;
-bool list_subtests;
-bool in_fixture;
-bool in_subtest;
-
-char test[] = "test";
-char list[] = "--list-subtests";
-char *argv_list[] = { test, list };
-char *argv_run[] = { test };
-
-static int do_fork(void)
-{
- int pid, status;
-
- switch (pid = fork()) {
- case -1:
- internal_assert(0);
- case 0:
- if (simple) {
- igt_simple_init(1, argv_run);
-
- igt_skip_on_simulation();
-
- igt_exit();
- } else {
- if (list_subtests)
- igt_subtest_init(2, argv_list);
- else
- igt_subtest_init(1, argv_run);
-
- if (in_fixture) {
- igt_fixture
- igt_skip_on_simulation();
- } if (in_subtest) {
- igt_subtest("sim")
- igt_skip_on_simulation();
- } else
- igt_skip_on_simulation();
-
- if (!in_subtest)
- igt_subtest("foo")
- ;
-
- igt_exit();
- }
- default:
- while (waitpid(pid, &status, 0) == -1 &&
- errno == EINTR)
- ;
-
- internal_assert(WIFEXITED(status));
-
- return WEXITSTATUS(status);
- }
-}
-
-int main(int argc, char **argv)
-{
- /* simple tests */
- simple = true;
- internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SKIP);
-
- internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SUCCESS);
-
- /* subtests, list mode */
- simple = false;
- list_subtests = true;
-
- in_fixture = false;
- internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SUCCESS);
-
- internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SUCCESS);
-
- in_fixture = true;
- internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SUCCESS);
-
- internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SUCCESS);
-
- in_fixture = false;
- in_subtest = true;
- internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SUCCESS);
-
- internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SUCCESS);
-
- /* subtest, run mode */
- simple = false;
- list_subtests = false;
-
- in_fixture = false;
- internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SKIP);
-
- internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SUCCESS);
-
- in_fixture = true;
- internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SKIP);
-
- internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SUCCESS);
-
- in_fixture = false;
- in_subtest = true;
- internal_assert(setenv("INTEL_SIMULATION", "1", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SKIP);
-
- internal_assert(setenv("INTEL_SIMULATION", "0", 1) == 0);
- internal_assert(do_fork() == IGT_EXIT_SUCCESS);
-
- return 0;
-}
--
2.1.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
