geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move mmfs tests over to be drm tests.

main
Eric Anholt 2008-04-29 13:45:43 -07:00
parent dabd056bf3
commit 3148c16364
5 changed files with 53 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -58,9 +58,9 @@ tests/getclient
tests/getstats tests/getstats
tests/getversion tests/getversion
tests/lock tests/lock
tests/mmfs_basic tests/mm_basic
tests/mmfs_mmap tests/mm_mmap
tests/mmfs_readwrite tests/mm_readwrite
tests/openclose tests/openclose
tests/setversion tests/setversion
tests/updatedraw tests/updatedraw

6
tests/Makefile.am
View File

@ -23,9 +23,9 @@ TESTS = auth \
lock \ lock \
setversion \ setversion \
updatedraw \ updatedraw \
mmfs_basic \ mm_basic \
mmfs_readwrite \ mm_readwrite \
mmfs_mmap mm_mmap
EXTRA_PROGRAMS = $(TESTS) EXTRA_PROGRAMS = $(TESTS)
CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LTLIBRARIES) CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LTLIBRARIES)

33
tests/mmfs_basic.c → tests/mm_basic.c
View File

@ -33,30 +33,18 @@
#include <inttypes.h> #include <inttypes.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "mmfs.h" #include "drm.h"
static void static void
test_bad_unref(int fd) test_bad_unref(int fd)
{ {
struct mmfs_unreference_args unref; struct drm_mm_unreference_args unref;
int ret; int ret;
printf("Testing error return on bad unreference ioctl.\n"); printf("Testing error return on bad unreference ioctl.\n");
unref.handle = 0x10101010; unref.handle = 0x10101010;
ret = ioctl(fd, MMFS_IOCTL_UNREFERENCE, &unref); ret = ioctl(fd, DRM_IOCTL_MM_UNREFERENCE, &unref);
assert(ret == -1 && errno == EINVAL);
}
static void
test_bad_ioctl(int fd)
{
int ret;
printf("Testing error return on bad ioctl.\n");
ret = ioctl(fd, _IO(MMFS_IOCTL_BASE, 0xf0), 0);
assert(ret == -1 && errno == EINVAL); assert(ret == -1 && errno == EINVAL);
} }
@ -64,32 +52,32 @@ test_bad_ioctl(int fd)
static void static void
test_alloc_unref(int fd) test_alloc_unref(int fd)
{ {
struct mmfs_alloc_args alloc; struct drm_mm_alloc_args alloc;
struct mmfs_unreference_args unref; struct drm_mm_unreference_args unref;
int ret; int ret;
printf("Testing allocating and unreferencing an object.\n"); printf("Testing allocating and unreferencing an object.\n");
memset(&alloc, 0, sizeof(alloc)); memset(&alloc, 0, sizeof(alloc));
alloc.size = 16 * 1024; alloc.size = 16 * 1024;
ret = ioctl(fd, MMFS_IOCTL_ALLOC, &alloc); ret = ioctl(fd, DRM_IOCTL_MM_ALLOC, &alloc);
assert(ret == 0); assert(ret == 0);
unref.handle = alloc.handle; unref.handle = alloc.handle;
ret = ioctl(fd, MMFS_IOCTL_UNREFERENCE, &unref); ret = ioctl(fd, DRM_IOCTL_MM_UNREFERENCE, &unref);
} }
static void static void
test_alloc_close(int fd) test_alloc_close(int fd)
{ {
struct mmfs_alloc_args alloc; struct drm_mm_alloc_args alloc;
int ret; int ret;
printf("Testing closing with an object allocated.\n"); printf("Testing closing with an object allocated.\n");
memset(&alloc, 0, sizeof(alloc)); memset(&alloc, 0, sizeof(alloc));
alloc.size = 16 * 1024; alloc.size = 16 * 1024;
ret = ioctl(fd, MMFS_IOCTL_ALLOC, &alloc); ret = ioctl(fd, DRM_IOCTL_MM_ALLOC, &alloc);
assert(ret == 0); assert(ret == 0);
close(fd); close(fd);
@ -99,9 +87,8 @@ int main(int argc, char **argv)
{ {
int fd; int fd;
fd = open_mmfs_device(); fd = drm_open_any();
test_bad_ioctl(fd);
test_bad_unref(fd); test_bad_unref(fd);
test_alloc_unref(fd); test_alloc_unref(fd);
test_alloc_close(fd); test_alloc_close(fd);

40
tests/mmfs_mmap.c → tests/mm_mmap.c
View File

@ -33,13 +33,13 @@
#include <inttypes.h> #include <inttypes.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "mmfs.h" #include "drm.h"
#define MMFS_BUFFER_SIZE 16384 #define OBJECT_SIZE 16384
int do_read(int fd, int handle, void *buf, int offset, int size) int do_read(int fd, int handle, void *buf, int offset, int size)
{ {
struct mmfs_pread_args read; struct drm_mm_pread_args read;
/* Ensure that we don't have any convenient data in buf in case /* Ensure that we don't have any convenient data in buf in case
* we fail. * we fail.
@ -52,12 +52,12 @@ int do_read(int fd, int handle, void *buf, int offset, int size)
read.size = size; read.size = size;
read.offset = offset; read.offset = offset;
return ioctl(fd, MMFS_IOCTL_PREAD, &read); return ioctl(fd, DRM_IOCTL_MM_PREAD, &read);
} }
int do_write(int fd, int handle, void *buf, int offset, int size) int do_write(int fd, int handle, void *buf, int offset, int size)
{ {
struct mmfs_pwrite_args write; struct drm_mm_pwrite_args write;
memset(&write, 0, sizeof(write)); memset(&write, 0, sizeof(write));
write.handle = handle; write.handle = handle;
@ -65,41 +65,41 @@ int do_write(int fd, int handle, void *buf, int offset, int size)
write.size = size; write.size = size;
write.offset = offset; write.offset = offset;
return ioctl(fd, MMFS_IOCTL_PWRITE, &write); return ioctl(fd, DRM_IOCTL_MM_PWRITE, &write);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int fd; int fd;
struct mmfs_alloc_args alloc; struct drm_mm_alloc_args alloc;
struct mmfs_mmap_args mmap; struct drm_mm_mmap_args mmap;
struct mmfs_unreference_args unref; struct drm_mm_unreference_args unref;
uint8_t expected[MMFS_BUFFER_SIZE]; uint8_t expected[OBJECT_SIZE];
uint8_t buf[MMFS_BUFFER_SIZE]; uint8_t buf[OBJECT_SIZE];
int ret; int ret;
int handle; int handle;
fd = open_mmfs_device(); fd = drm_open_any();
memset(&mmap, 0, sizeof(mmap)); memset(&mmap, 0, sizeof(mmap));
mmap.handle = 0x10101010; mmap.handle = 0x10101010;
mmap.offset = 0; mmap.offset = 0;
mmap.size = 4096; mmap.size = 4096;
printf("Testing mmaping of bad object.\n"); printf("Testing mmaping of bad object.\n");
ret = ioctl(fd, MMFS_IOCTL_MMAP, &mmap); ret = ioctl(fd, DRM_IOCTL_MM_MMAP, &mmap);
assert(ret == -1 && errno == EINVAL); assert(ret == -1 && errno == EINVAL);
memset(&alloc, 0, sizeof(alloc)); memset(&alloc, 0, sizeof(alloc));
alloc.size = MMFS_BUFFER_SIZE; alloc.size = OBJECT_SIZE;
ret = ioctl(fd, MMFS_IOCTL_ALLOC, &alloc); ret = ioctl(fd, DRM_IOCTL_MM_ALLOC, &alloc);
assert(ret == 0); assert(ret == 0);
handle = alloc.handle; handle = alloc.handle;
printf("Testing mmaping of newly allocated object.\n"); printf("Testing mmaping of newly allocated object.\n");
mmap.handle = handle; mmap.handle = handle;
mmap.offset = 0; mmap.offset = 0;
mmap.size = MMFS_BUFFER_SIZE; mmap.size = OBJECT_SIZE;
ret = ioctl(fd, MMFS_IOCTL_MMAP, &mmap); ret = ioctl(fd, DRM_IOCTL_MM_MMAP, &mmap);
assert(ret == 0); assert(ret == 0);
printf("Testing contents of newly allocated object.\n"); printf("Testing contents of newly allocated object.\n");
@ -110,18 +110,18 @@ int main(int argc, char **argv)
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
memset(buf + 1024, 0x01, 1024); memset(buf + 1024, 0x01, 1024);
memset(expected + 1024, 0x01, 1024); memset(expected + 1024, 0x01, 1024);
ret = do_write(fd, handle, buf, 0, MMFS_BUFFER_SIZE); ret = do_write(fd, handle, buf, 0, OBJECT_SIZE);
assert(ret == 0); assert(ret == 0);
assert(memcmp(buf, mmap.addr, sizeof(buf)) == 0); assert(memcmp(buf, mmap.addr, sizeof(buf)) == 0);
printf("Testing that mapping stays after unreference\n"); printf("Testing that mapping stays after unreference\n");
unref.handle = handle; unref.handle = handle;
ret = ioctl(fd, MMFS_IOCTL_UNREFERENCE, &unref); ret = ioctl(fd, DRM_IOCTL_MM_UNREFERENCE, &unref);
assert(ret == 0); assert(ret == 0);
assert(memcmp(buf, mmap.addr, sizeof(buf)) == 0); assert(memcmp(buf, mmap.addr, sizeof(buf)) == 0);
printf("Testing unmapping\n"); printf("Testing unmapping\n");
munmap(mmap.addr, MMFS_BUFFER_SIZE); munmap(mmap.addr, OBJECT_SIZE);
close(fd); close(fd);

34
tests/mmfs_readwrite.c → tests/mm_readwrite.c
View File

@ -33,13 +33,13 @@
#include <inttypes.h> #include <inttypes.h>
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "mmfs.h" #include "drm.h"
#define MMFS_BUFFER_SIZE 16384 #define OBJECT_SIZE 16384
int do_read(int fd, int handle, void *buf, int offset, int size) int do_read(int fd, int handle, void *buf, int offset, int size)
{ {
struct mmfs_pread_args read; struct drm_mm_pread_args read;
/* Ensure that we don't have any convenient data in buf in case /* Ensure that we don't have any convenient data in buf in case
* we fail. * we fail.
@ -52,12 +52,12 @@ int do_read(int fd, int handle, void *buf, int offset, int size)
read.size = size; read.size = size;
read.offset = offset; read.offset = offset;
return ioctl(fd, MMFS_IOCTL_PREAD, &read); return ioctl(fd, DRM_IOCTL_MM_PREAD, &read);
} }
int do_write(int fd, int handle, void *buf, int offset, int size) int do_write(int fd, int handle, void *buf, int offset, int size)
{ {
struct mmfs_pwrite_args write; struct drm_mm_pwrite_args write;
memset(&write, 0, sizeof(write)); memset(&write, 0, sizeof(write));
write.handle = handle; write.handle = handle;
@ -65,43 +65,43 @@ int do_write(int fd, int handle, void *buf, int offset, int size)
write.size = size; write.size = size;
write.offset = offset; write.offset = offset;
return ioctl(fd, MMFS_IOCTL_PWRITE, &write); return ioctl(fd, DRM_IOCTL_MM_PWRITE, &write);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int fd; int fd;
struct mmfs_alloc_args alloc; struct drm_mm_alloc_args alloc;
uint8_t expected[MMFS_BUFFER_SIZE]; uint8_t expected[OBJECT_SIZE];
uint8_t buf[MMFS_BUFFER_SIZE]; uint8_t buf[OBJECT_SIZE];
int ret; int ret;
int handle; int handle;
fd = open_mmfs_device(); fd = drm_open_any();
memset(&alloc, 0, sizeof(alloc)); memset(&alloc, 0, sizeof(alloc));
alloc.size = MMFS_BUFFER_SIZE; alloc.size = OBJECT_SIZE;
ret = ioctl(fd, MMFS_IOCTL_ALLOC, &alloc); ret = ioctl(fd, DRM_IOCTL_MM_ALLOC, &alloc);
assert(ret == 0); assert(ret == 0);
handle = alloc.handle; handle = alloc.handle;
printf("Testing contents of newly allocated object.\n"); printf("Testing contents of newly allocated object.\n");
ret = do_read(fd, handle, buf, 0, MMFS_BUFFER_SIZE); ret = do_read(fd, handle, buf, 0, OBJECT_SIZE);
assert(ret == 0); assert(ret == 0);
memset(&expected, 0, sizeof(expected)); memset(&expected, 0, sizeof(expected));
assert(memcmp(expected, buf, sizeof(expected)) == 0); assert(memcmp(expected, buf, sizeof(expected)) == 0);
printf("Testing read beyond end of buffer.\n"); printf("Testing read beyond end of buffer.\n");
ret = do_read(fd, handle, buf, MMFS_BUFFER_SIZE / 2, MMFS_BUFFER_SIZE); ret = do_read(fd, handle, buf, OBJECT_SIZE / 2, OBJECT_SIZE);
assert(ret == -1 && errno == EINVAL); assert(ret == -1 && errno == EINVAL);
printf("Testing full write of buffer\n"); printf("Testing full write of buffer\n");
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
memset(buf + 1024, 0x01, 1024); memset(buf + 1024, 0x01, 1024);
memset(expected + 1024, 0x01, 1024); memset(expected + 1024, 0x01, 1024);
ret = do_write(fd, handle, buf, 0, MMFS_BUFFER_SIZE); ret = do_write(fd, handle, buf, 0, OBJECT_SIZE);
assert(ret == 0); assert(ret == 0);
ret = do_read(fd, handle, buf, 0, MMFS_BUFFER_SIZE); ret = do_read(fd, handle, buf, 0, OBJECT_SIZE);
assert(ret == 0); assert(ret == 0);
assert(memcmp(buf, expected, sizeof(buf)) == 0); assert(memcmp(buf, expected, sizeof(buf)) == 0);
@ -110,7 +110,7 @@ int main(int argc, char **argv)
memset(expected + 4096, 0x02, 1024); memset(expected + 4096, 0x02, 1024);
ret = do_write(fd, handle, buf + 4096, 4096, 1024); ret = do_write(fd, handle, buf + 4096, 4096, 1024);
assert(ret == 0); assert(ret == 0);
ret = do_read(fd, handle, buf, 0, MMFS_BUFFER_SIZE); ret = do_read(fd, handle, buf, 0, OBJECT_SIZE);
assert(ret == 0); assert(ret == 0);
assert(memcmp(buf, expected, sizeof(buf)) == 0); assert(memcmp(buf, expected, sizeof(buf)) == 0);