aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am9
-rw-r--r--tests/modeprint/Makefile.am10
-rw-r--r--tests/modetest/Makefile.am10
-rw-r--r--tests/name_from_fd.c58
4 files changed, 73 insertions, 14 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index af44d6a3..4e4882ab 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,10 @@
NULL:=#
AM_CPPFLAGS = \
- -I $(top_srcdir)/shared-core \
- -I $(top_srcdir)/libdrm
+ -I $(top_srcdir)/include/drm \
+ -I $(top_srcdir)
-LDADD = $(top_builddir)/libdrm/libdrm.la
+LDADD = $(top_builddir)/libdrm.la
noinst_PROGRAMS = \
dristat \
@@ -24,7 +24,7 @@ libdrmtest_la_SOURCES = \
drmtest.h
libdrmtest_la_LIBADD = \
- $(top_builddir)/libdrm/libdrm.la \
+ $(top_builddir)/libdrm.la \
$(LIBUDEV_LIBS)
LDADD += libdrmtest.la
@@ -40,6 +40,7 @@ TESTS = \
getstats \
setversion \
updatedraw \
+ name_from_fd \
$(NULL)
if HAVE_INTEL
diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am
index 77f8ec78..2ae0fdc6 100644
--- a/tests/modeprint/Makefile.am
+++ b/tests/modeprint/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = \
- -I$(top_srcdir)/shared-core \
- -I$(top_srcdir)/libdrm/intel/ \
- -I$(top_srcdir)/libdrm
+ -I$(top_srcdir)/include/drm \
+ -I$(top_srcdir)/intel/ \
+ -I$(top_srcdir)
noinst_PROGRAMS = \
modeprint
@@ -9,5 +9,5 @@ noinst_PROGRAMS = \
modeprint_SOURCES = \
modeprint.c
modeprint_LDADD = \
- $(top_builddir)/libdrm/libdrm.la \
- $(top_builddir)/libdrm/intel/libdrm_intel.la
+ $(top_builddir)/libdrm.la \
+ $(top_builddir)/intel/libdrm_intel.la
diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
index 860fe064..16f5e995 100644
--- a/tests/modetest/Makefile.am
+++ b/tests/modetest/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = \
- -I$(top_srcdir)/shared-core \
- -I$(top_srcdir)/libdrm/intel/ \
- -I$(top_srcdir)/libdrm \
+ -I$(top_srcdir)/include/drm \
+ -I$(top_srcdir)/intel/ \
+ -I$(top_srcdir) \
$(CAIRO_CFLAGS)
noinst_PROGRAMS = \
@@ -10,6 +10,6 @@ noinst_PROGRAMS = \
modetest_SOURCES = \
modetest.c
modetest_LDADD = \
- $(top_builddir)/libdrm/libdrm.la \
- $(top_builddir)/libdrm/intel/libdrm_intel.la \
+ $(top_builddir)/libdrm.la \
+ $(top_builddir)/intel/libdrm_intel.la \
$(CAIRO_LIBS)
diff --git a/tests/name_from_fd.c b/tests/name_from_fd.c
new file mode 100644
index 00000000..330c8ff0
--- /dev/null
+++ b/tests/name_from_fd.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2009 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:
+ * Kristian Høgsberg <krh@bitplanet.net>
+ *
+ */
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <limits.h>
+#include "drmtest.h"
+
+/**
+ * Checks drmGetDeviceNameFromFd
+ *
+ * This tests that we can get the actual version out, and that setting invalid
+ * major/minor numbers fails appropriately. It does not check the actual
+ * behavior differenses resulting from an increased DI version.
+ */
+int main(int argc, char **argv)
+{
+ int fd, ret;
+ drm_set_version_t sv, version;
+ const char *name = "/dev/dri/card0";
+ char *v;
+
+ fd = open("/dev/dri/card0", O_RDWR);
+ if (fd == -1)
+ return 0;
+
+ v = drmGetDeviceNameFromFd(fd);
+ close(fd);
+
+ assert(strcmp(name, v) == 0);
+ drmFree(v);
+
+ return 0;
+}