Module Name: src
Committed By: haad
Date: Wed Oct 6 11:24:56 UTC 2010
Added Files:
src/tests/dev/dm: Atffile Makefile dm_targets_cmd.plist
dm_version_cmd.plist h_dm.c t_dm.sh
Log Message:
Import new test program for device-mapper driver it currently call
dm_version_list
and dm_targets_list ioctl to test if dm driver inside rump works.
It will be disable for now, because I need to find out why if I run this
test by atf-run it fails while running h_dm by hand works.
XXX. component.c in rump/libdm calls devsw_attach before dm_modcmd can do
that therefore unmodified modcmd returns error.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/dev/dm/Atffile src/tests/dev/dm/Makefile \
src/tests/dev/dm/dm_targets_cmd.plist \
src/tests/dev/dm/dm_version_cmd.plist src/tests/dev/dm/h_dm.c \
src/tests/dev/dm/t_dm.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tests/dev/dm/Atffile
diff -u /dev/null src/tests/dev/dm/Atffile:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/Atffile Wed Oct 6 11:24:55 2010
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/10/06 11:24:55 haad Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: t_*
Index: src/tests/dev/dm/Makefile
diff -u /dev/null src/tests/dev/dm/Makefile:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/Makefile Wed Oct 6 11:24:55 2010
@@ -0,0 +1,27 @@
+
+# $NetBSD: Makefile,v 1.1 2010/10/06 11:24:55 haad Exp $
+#
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/dev/dm
+FILESDIR= ${TESTSDIR}
+
+TESTS_SH= t_dm
+TESTS_C= h_dm
+
+ATFFILE= yes
+
+
+LDADD+= -lprop -lutil
+LDADD+= -lrumpdev_disk -lrumpdev_dm
+LDADD+= -lrumpdev -lrumpvfs
+LDADD+= -lrump
+LDADD+= -lrumpuser -lpthread
+
+FILES= t_dm_disk_1.bz2.uue t_dm_disk_2.bz2.uue t_dm_disk_3.bz2.uue
+
+WARNS= 4
+NOMAN=
+
+.include <bsd.test.mk>
Index: src/tests/dev/dm/dm_targets_cmd.plist
diff -u /dev/null src/tests/dev/dm/dm_targets_cmd.plist:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/dm_targets_cmd.plist Wed Oct 6 11:24:55 2010
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>cmd_data</key>
+ <array/>
+ <key>command</key>
+ <string>targets</string>
+ <key>event_nr</key>
+ <integer>0x0</integer>
+ <key>flags</key>
+ <integer>0x4</integer>
+ <key>version</key>
+ <array>
+ <integer>0x4</integer>
+ <integer>0x1</integer>
+ <integer>0x0</integer>
+ </array>
+</dict>
+</plist>
\ No newline at end of file
Index: src/tests/dev/dm/dm_version_cmd.plist
diff -u /dev/null src/tests/dev/dm/dm_version_cmd.plist:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/dm_version_cmd.plist Wed Oct 6 11:24:55 2010
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>cmd_data</key>
+ <array/>
+ <key>command</key>
+ <string>version</string>
+ <key>event_nr</key>
+ <integer>0x0</integer>
+ <key>flags</key>
+ <integer>0x4</integer>
+ <key>version</key>
+ <array>
+ <integer>0x4</integer>
+ <integer>0x0</integer>
+ <integer>0x0</integer>
+ </array>
+</dict>
+</plist>
\ No newline at end of file
Index: src/tests/dev/dm/h_dm.c
diff -u /dev/null src/tests/dev/dm/h_dm.c:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/h_dm.c Wed Oct 6 11:24:55 2010
@@ -0,0 +1,146 @@
+/* $NetBSD: h_dm.c,v 1.1 2010/10/06 11:24:55 haad Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/disklabel.h>
+
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <util.h>
+
+#include <dev/dm/netbsd-dm.h>
+
+int dm_test_targets(void);
+int dm_test_versions(void);
+
+/*
+ * Test simple dm versions command on device-mapper device.
+ */
+int
+dm_test_versions(void) {
+ int fd;
+ int error;
+ prop_dictionary_t dict_in, dict_out;
+ struct plistref prefp;
+ char *xml;
+
+ error = 0;
+
+ error = rump_init();
+ if (error != 0)
+ err(1, "Rump init failed");
+
+ fd = rump_sys_open("/dev/mapper/control", O_RDWR, 0);
+ if (fd == -1)
+ err(1, "Open dm device failed");
+
+ dict_in = prop_dictionary_internalize_from_file("dm_version_cmd.plist");
+ dict_out = prop_dictionary_create();
+
+ prop_dictionary_externalize_to_pref(dict_in, &prefp);
+
+ error = rump_sys_ioctl(fd, NETBSD_DM_IOCTL, &prefp);
+ if (error < 0)
+ err(1, "Dm control ioctl failed");
+
+ dict_out = prop_dictionary_internalize(prefp.pref_plist);
+
+ xml = prop_dictionary_externalize(dict_out);
+
+ rump_sys_close(fd);
+
+ return error;
+}
+
+/*
+ * Test simple dm targets command on device-mapper device.
+ */
+int
+dm_test_targets(void) {
+ int fd;
+ int error;
+ prop_dictionary_t dict_in, dict_out;
+ struct plistref prefp;
+ char *xml;
+
+ error = 0;
+
+ error = rump_init();
+ if (error != 0)
+ err(1, "Rump init failed");
+
+ fd = rump_sys_open("/dev/mapper/control", O_RDWR, 0);
+ if (fd == -1)
+ err(1, "Open dm device failed");
+
+ dict_in = prop_dictionary_internalize_from_file("dm_targets_cmd.plist");
+ dict_out = prop_dictionary_create();
+
+ prop_dictionary_externalize_to_pref(dict_in, &prefp);
+
+ error = rump_sys_ioctl(fd, NETBSD_DM_IOCTL, &prefp);
+ if (error < 0)
+ err(1, "Dm control ioctl failed");
+
+ dict_out = prop_dictionary_internalize(prefp.pref_plist);
+
+ xml = prop_dictionary_externalize(dict_out);
+
+ rump_sys_close(fd);
+
+ return error;
+}
+
+int
+main(int argc, char **argv) {
+ int error;
+
+ error = 0;
+
+ error = dm_test_versions();
+ if (error != 0)
+ err(1, "dm_test_versions failed");
+
+ error = dm_test_targets();
+ if (error != 0)
+ err(1, "dm_test_targets failed");
+
+ return error;
+}
Index: src/tests/dev/dm/t_dm.sh
diff -u /dev/null src/tests/dev/dm/t_dm.sh:1.1
--- /dev/null Wed Oct 6 11:24:56 2010
+++ src/tests/dev/dm/t_dm.sh Wed Oct 6 11:24:55 2010
@@ -0,0 +1,48 @@
+# $NetBSD: t_dm.sh,v 1.1 2010/10/06 11:24:55 haad Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+atf_test_case dm_test
+dm_test_head()
+{
+ atf_set "descr" "Check dm driver routines and create lineary, stripe mapped disks"
+ atf_set "use.fs" "true"
+}
+
+dm_test_body()
+{
+ # XXX Actually we need disks than 1 for stripe check let it leave for later now.
+ #atf_check -s exit:0 uudecode $(atf_get_srcdir)/t_dm_disk_1.bz2.uue
+ #atf_check -s exit:0 bunzip2 t_dm_disk_1.bz2
+ #atf_check -s exit:0 -o file:t_dm_disk_1 $(atf_get_srcdir)/h_dm
+ atf_check -s exit:0 $(atf_get_srcdir)/h_dm
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case dm_test
+}
