Module Name: src
Committed By: pooka
Date: Tue Dec 14 17:48:32 UTC 2010
Modified Files:
src/tests/dev/cgd: Makefile t_cgd.sh
Added Files:
src/tests/dev/cgd: paramsfile
Removed Files:
src/tests/dev/cgd/h_img2cgd: Makefile cgd.conf img2cgd.c
Log Message:
Retire the old C helper in h_img2cgd since we can now write everything
with a shellscript in terms of rump.cgdconfig and dd.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/dev/cgd/Makefile \
src/tests/dev/cgd/t_cgd.sh
cvs rdiff -u -r0 -r1.1 src/tests/dev/cgd/paramsfile
cvs rdiff -u -r1.2 -r0 src/tests/dev/cgd/h_img2cgd/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/dev/cgd/h_img2cgd/cgd.conf \
src/tests/dev/cgd/h_img2cgd/img2cgd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/dev/cgd/Makefile
diff -u src/tests/dev/cgd/Makefile:1.1 src/tests/dev/cgd/Makefile:1.2
--- src/tests/dev/cgd/Makefile:1.1 Thu Nov 11 22:38:47 2010
+++ src/tests/dev/cgd/Makefile Tue Dec 14 17:48:31 2010
@@ -1,18 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2010/11/11 22:38:47 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/14 17:48:31 pooka Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/dev/cgd
+FILES= paramsfile
+FILESDIR= ${TESTSDIR}
TESTS_SH= t_cgd
-SUBDIR= h_img2cgd
-
-LDADD+= -lrumpdev_cgd -lrumpdev -lrumpvfs
-LDADD+= -lrump
-LDADD+= -lrumpuser -lpthread
-
-NOMAN=
-
.include <bsd.test.mk>
Index: src/tests/dev/cgd/t_cgd.sh
diff -u src/tests/dev/cgd/t_cgd.sh:1.1 src/tests/dev/cgd/t_cgd.sh:1.2
--- src/tests/dev/cgd/t_cgd.sh:1.1 Thu Nov 11 22:38:47 2010
+++ src/tests/dev/cgd/t_cgd.sh Tue Dec 14 17:48:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_cgd.sh,v 1.1 2010/11/11 22:38:47 pooka Exp $
+# $NetBSD: t_cgd.sh,v 1.2 2010/12/14 17:48:31 pooka Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -36,13 +36,22 @@
{
d=$(atf_get_srcdir)
+ atf_check -s exit:0 \
+ rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
+
+ export RUMP_SERVER=unix://csock
atf_check -s exit:0 sh -c "echo 12345 | \
- $d/h_img2cgd/h_img2cgd $d/h_img2cgd/cgd.conf write \
- enc.img $d/h_img2cgd/cgd.conf"
- atf_check -s exit:0 sh -c "echo 12345 | \
- $d/h_img2cgd/h_img2cgd $d/h_img2cgd/cgd.conf read \
- enc.img clear.txt"
- atf_check -s exit:0 cmp clear.txt $d/h_img2cgd/cgd.conf
+ rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
+ atf_check -s exit:0 -e ignore dd if=${d}/t_cgd rof=/dev/rcgd0d count=2
+ atf_check -s exit:0 -e ignore dd if=${d}/t_cgd of=testfile count=2
+ atf_check -s exit:0 -e ignore -o file:testfile \
+ dd rif=/dev/rcgd0d count=2
+}
+
+basic_cleanup()
+{
+
+ env RUMP_SERVER=unix://csock rump.halt
}
atf_test_case wrongpass
@@ -57,13 +66,22 @@
{
d=$(atf_get_srcdir)
+ atf_check -s exit:0 \
+ rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock
+
+ export RUMP_SERVER=unix://csock
atf_check -s exit:0 sh -c "echo 12345 | \
- $d/h_img2cgd/h_img2cgd $d/h_img2cgd/cgd.conf write \
- enc.img $d/h_img2cgd/cgd.conf"
+ rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
+ atf_check -s exit:0 -e ignore dd if=${d}/t_cgd rof=/dev/rcgd0d count=2
+
+ # unconfig and reconfig cgd
+ atf_check -s exit:0 rump.cgdconfig -u cgd0
atf_check -s exit:0 sh -c "echo 54321 | \
- $d/h_img2cgd/h_img2cgd $d/h_img2cgd/cgd.conf read \
- enc.img clear.txt"
- atf_check -s not-exit:0 cmp -s clear.txt $d/h_img2cgd/cgd.conf
+ rump.cgdconfig -p cgd0 /dev/dk ${d}/paramsfile"
+
+ atf_check -s exit:0 -e ignore dd if=${d}/t_cgd of=testfile count=2
+ atf_check -s exit:0 -e ignore -o not-file:testfile \
+ dd rif=/dev/rcgd0d count=2
}
atf_init_test_cases()
Added files:
Index: src/tests/dev/cgd/paramsfile
diff -u /dev/null src/tests/dev/cgd/paramsfile:1.1
--- /dev/null Tue Dec 14 17:48:32 2010
+++ src/tests/dev/cgd/paramsfile Tue Dec 14 17:48:31 2010
@@ -0,0 +1,8 @@
+algorithm aes-cbc;
+iv-method encblkno1;
+keylength 128;
+verify_method none;
+keygen pkcs5_pbkdf2/sha1 {
+ iterations 42;
+ salt AAAAgKajcCnHR7sR1k1RKQ9Q0uY=;
+};
