Move library selftests to lib/tests

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@ffwll.ch>

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

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

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)

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)

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

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@ffwll.ch>
+ *
+ */
+
+#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();
+	}
+}

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@ffwll.ch>
+ *
+ */
+
+#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();
+}

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@ffwll.ch>
+ *
+ */
+
+#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")
+		;
+}

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@ffwll.ch>
+ *
+ */
+
+#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")
+		;
+}

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@ffwll.ch>
+ *
+ */
+
+#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();
+}

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@ffwll.ch>
+ *
+ */
+
+#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;
+}