Index: head/etc/mtree/BSD.tests.dist =================================================================== --- head/etc/mtree/BSD.tests.dist (revision 315319) +++ head/etc/mtree/BSD.tests.dist (revision 315320) @@ -1,704 +1,706 @@ # $FreeBSD$ # # Please see the file src/etc/mtree/README before making changes to this file. # /set type=dir uname=root gname=wheel mode=0755 . bin cat .. date .. dd .. expr .. ls .. mv .. pax .. pkill .. pwait .. sh builtins .. errors .. execution .. expansion .. parameters .. parser .. set-e .. .. sleep .. test .. .. cddl lib .. sbin .. usr.bin .. usr.sbin dtrace common aggs .. arithmetic .. arrays .. assocs .. begin .. bitfields .. buffering .. builtinvar .. cg .. clauses .. cpc .. decls .. drops .. dtraceUtil .. end .. enum .. error .. exit .. fbtprovider .. funcs .. grammar .. include .. inline .. io .. ip .. java_api .. json .. lexer .. llquantize .. mdb .. mib .. misc .. multiaggs .. offsetof .. operators .. pid .. plockstat .. pointers .. pragma .. predicates .. preprocessor .. print .. printa .. printf .. privs .. probes .. proc .. profile-n .. providers .. raise .. rates .. safety .. scalars .. sched .. scripting .. sdt .. sizeof .. speculation .. stability .. stack .. stackdepth .. stop .. strlen .. strtoll .. struct .. sugar .. syscall .. sysevent .. tick-n .. trace .. tracemem .. translators .. typedef .. types .. uctf .. union .. usdt .. ustack .. vars .. version .. .. .. zfsd .. .. .. etc rc.d .. .. games .. gnu lib .. usr.bin diff .. .. .. lib atf libatf-c detail .. .. libatf-c++ detail .. .. test-programs .. .. libarchive .. libc c063 .. db .. gen execve .. posix_spawn .. .. hash data .. .. iconv .. inet .. locale .. net getaddrinfo data .. .. .. nss .. regex data .. .. resolv .. rpc .. ssp .. setjmp .. stdio .. stdlib .. string .. sys .. time .. tls dso .. .. termios .. ttyio .. .. + libcam + .. libcasper services cap_dns .. cap_grp .. cap_pwd .. cap_sysctl .. .. .. libcrypt .. libdevdctl .. libmp .. libnv .. libproc .. librt .. libthr dlopen .. .. libutil .. libxo .. msun .. .. libexec atf atf-check .. atf-sh .. .. rtld-elf .. .. sbin dhclient .. devd .. growfs .. ifconfig .. mdconfig .. .. secure lib .. libexec .. usr.bin .. usr.sbin .. .. share examples tests atf .. plain .. .. .. .. sys acl .. aio .. fifo .. file .. fs tmpfs .. .. geom class concat .. eli .. gate .. gpt .. mirror .. nop .. raid3 .. shsec .. stripe .. uzip etalon .. .. .. .. kern acct .. execve .. pipe .. .. kqueue libkqueue .. .. mac bsdextended .. portacl .. .. mqueue .. netinet .. opencrypto .. pjdfstest chflags .. chmod .. chown .. ftruncate .. granular .. link .. mkdir .. mkfifo .. mknod .. open .. rename .. rmdir .. symlink .. truncate .. unlink .. .. posixshm .. sys .. vfs .. vm .. .. usr.bin apply .. basename .. bmake archives fmt_44bsd .. fmt_44bsd_mod .. fmt_oldbsd .. .. basic t0 .. t1 .. t2 .. t3 .. .. execution ellipsis .. empty .. joberr .. plus .. .. shell builtin .. meta .. path .. path_select .. replace .. select .. .. suffixes basic .. src_wild1 .. src_wild2 .. .. syntax directive-t0 .. enl .. funny-targets .. semi .. .. sysmk t0 2 1 .. .. mk .. .. t1 2 1 .. .. mk .. .. t2 2 1 .. .. mk .. .. .. variables modifier_M .. modifier_t .. opt_V .. t0 .. .. .. bsdcat .. calendar .. cmp .. cpio .. col .. comm .. cut .. diff .. dirname .. file2c .. grep .. gzip .. ident .. indent .. join .. jot .. lastcomm .. limits .. m4 .. mkimg .. ncal .. opensm .. printf .. sdiff .. sed regress.multitest.out .. .. soelim .. tail .. tar .. timeout .. tr .. truncate .. units .. uudecode .. uuencode .. uniq .. xargs .. xinstall .. xo .. yacc yacc .. .. .. usr.sbin chown .. etcupdate .. extattr .. fstyp .. makefs .. newsyslog .. nmtree .. pw .. rpcbind .. sa .. .. .. # vim: set expandtab ts=4 sw=4: Index: head/lib/libcam/Makefile =================================================================== --- head/lib/libcam/Makefile (revision 315319) +++ head/lib/libcam/Makefile (revision 315320) @@ -1,46 +1,50 @@ # $FreeBSD$ PACKAGE= lib${LIB} LIB= cam SHLIBDIR?= /lib SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \ ata_all.c smp_all.c INCS= camlib.h LIBADD= sbuf MAN= cam.3 cam_cdbparse.3 WARNS?= 2 MLINKS+= cam.3 cam_open_device.3 \ cam.3 cam_open_spec_device.3 \ cam.3 cam_open_btl.3 \ cam.3 cam_open_pass.3 \ cam.3 cam_close_device.3 \ cam.3 cam_close_spec_device.3 \ cam.3 cam_getccb.3 \ cam.3 cam_send_ccb.3 \ cam.3 cam_freeccb.3 \ cam.3 cam_path_string.3 \ cam.3 cam_device_dup.3 \ cam.3 cam_device_copy.3 \ cam.3 cam_get_device.3 \ cam_cdbparse.3 csio_build.3 \ cam_cdbparse.3 csio_build_visit.3 \ cam_cdbparse.3 csio_decode.3 \ cam_cdbparse.3 csio_decode_visit.3 \ cam_cdbparse.3 buff_decode.3 \ cam_cdbparse.3 buff_decode_visit.3 \ cam_cdbparse.3 csio_encode.3 \ cam_cdbparse.3 csio_encode_visit.3 \ cam_cdbparse.3 buff_encode_visit.3 .PATH: ${SRCTOP}/sys/cam/scsi ${SRCTOP}/sys/cam/ata \ ${SRCTOP}/sys/cam CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys SHLIB_MAJOR= 7 +.include + +SUBDIR.${MK_TESTS}+= tests + .include Index: head/lib/libcam/tests/Makefile =================================================================== --- head/lib/libcam/tests/Makefile (nonexistent) +++ head/lib/libcam/tests/Makefile (revision 315320) @@ -0,0 +1,9 @@ +# $FreeBSD$ + +ATF_TESTS_C+= libcam_test + +LIBADD+= cam + +WARNS?= 6 + +.include Property changes on: head/lib/libcam/tests/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lib/libcam/tests/libcam_test.c =================================================================== --- head/lib/libcam/tests/libcam_test.c (nonexistent) +++ head/lib/libcam/tests/libcam_test.c (revision 315320) @@ -0,0 +1,217 @@ +/*- + * Copyright (c) 2017 Ngie Cooper + * 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 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 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. + * + * $FreeBSD$ + */ + +#include +#include +#include +#include + +#include + +static const char * +get_cam_test_device(const atf_tc_t *tc) +{ + const char *cam_test_device; + + cam_test_device = atf_tc_get_config_var(tc, "cam_test_device"); + + return (cam_test_device); +} + +static void +cam_clear_error(void) +{ + + strcpy(cam_errbuf, ""); +} + +static bool +cam_has_error(void) +{ + + return (strlen(cam_errbuf) != 0); +} + +ATF_TC(cam_open_device_negative_test_O_RDONLY); +ATF_TC_HEAD(cam_open_device_negative_test_O_RDONLY, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "test that cam_open_device(`cam_device`, O_RDONLY) fails to open " + "the underlying pass(4) device (bug 217649)"); + atf_tc_set_md_var(tc, "require.config", "cam_test_device"); + atf_tc_set_md_var(tc, "require.user", "root"); +} + +ATF_TC_BODY(cam_open_device_negative_test_O_RDONLY, tc) +{ + const char *cam_test_device; + + cam_test_device = get_cam_test_device(tc); + + cam_clear_error(); + ATF_CHECK(cam_open_device(cam_test_device, O_RDONLY) == NULL); + ATF_REQUIRE(cam_has_error()); +} + +ATF_TC(cam_open_device_negative_test_nonexistent); +ATF_TC_HEAD(cam_open_device_negative_test_nonexistent, tc) +{ + + atf_tc_set_md_var(tc, "require.user", "root"); +} + +ATF_TC_BODY(cam_open_device_negative_test_nonexistent, tc) +{ + + cam_clear_error(); + ATF_REQUIRE(cam_open_device("/nonexistent", O_RDWR) == NULL); + ATF_REQUIRE(cam_has_error()); +} + +ATF_TC(cam_open_device_negative_test_unprivileged); +ATF_TC_HEAD(cam_open_device_negative_test_unprivileged, tc) +{ + + atf_tc_set_md_var(tc, "require.config", "cam_test_device"); + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} + +ATF_TC_BODY(cam_open_device_negative_test_unprivileged, tc) +{ + const char *cam_test_device; + + cam_test_device = get_cam_test_device(tc); + + cam_clear_error(); + ATF_CHECK(cam_open_device(cam_test_device, O_RDONLY) == NULL); + ATF_REQUIRE(cam_has_error()); + + cam_clear_error(); + ATF_CHECK(cam_open_device(cam_test_device, O_RDWR) == NULL); + ATF_REQUIRE(cam_has_error()); +} + +ATF_TC(cam_open_device_positive_test); +ATF_TC_HEAD(cam_open_device_positive_test, tc) +{ + + atf_tc_set_md_var(tc, "require.config", "cam_test_device"); + atf_tc_set_md_var(tc, "require.user", "root"); +} + +ATF_TC_BODY(cam_open_device_positive_test, tc) +{ + struct cam_device *cam_dev; + const char *cam_test_device; + + cam_test_device = get_cam_test_device(tc); + + cam_clear_error(); + cam_dev = cam_open_device(cam_test_device, O_RDWR); + ATF_CHECK_MSG(cam_dev != NULL, "cam_open_device failed: %s", + cam_errbuf); + ATF_REQUIRE(!cam_has_error()); + cam_close_device(cam_dev); +} + +ATF_TC(cam_close_device_negative_test_NULL); +ATF_TC_HEAD(cam_close_device_negative_test_NULL, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "test that cam_close_device(NULL) succeeds without error"); + atf_tc_set_md_var(tc, "require.user", "root"); +} + +ATF_TC_BODY(cam_close_device_negative_test_NULL, tc) +{ + + cam_clear_error(); + cam_close_device(NULL); + ATF_REQUIRE(!cam_has_error()); +} + +ATF_TC(cam_getccb_positive_test); +ATF_TC_HEAD(cam_getccb_positive_test, tc) +{ + + atf_tc_set_md_var(tc, "require.config", "cam_test_device"); + atf_tc_set_md_var(tc, "require.user", "root"); +} + +ATF_TC_BODY(cam_getccb_positive_test, tc) +{ + union ccb *cam_ccb; + struct cam_device *cam_dev; + const char *cam_test_device; + + cam_test_device = get_cam_test_device(tc); + + cam_clear_error(); + cam_dev = cam_open_device(cam_test_device, O_RDWR); + ATF_CHECK_MSG(cam_dev != NULL, "cam_open_device failed: %s", + cam_errbuf); + ATF_REQUIRE(!cam_has_error()); + cam_ccb = cam_getccb(cam_dev); + ATF_CHECK_MSG(cam_ccb != NULL, "get_camccb failed: %s", cam_errbuf); + ATF_REQUIRE(!cam_has_error()); + cam_freeccb(cam_ccb); + cam_close_device(cam_dev); +} + +ATF_TC(cam_freeccb_negative_test_NULL); +ATF_TC_HEAD(cam_freeccb_negative_test_NULL, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "test that cam_freeccb(NULL) succeeds without error"); + atf_tc_set_md_var(tc, "require.user", "root"); +} + +ATF_TC_BODY(cam_freeccb_negative_test_NULL, tc) +{ + + cam_clear_error(); + cam_freeccb(NULL); + ATF_REQUIRE(!cam_has_error()); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, cam_open_device_negative_test_O_RDONLY); + ATF_TP_ADD_TC(tp, cam_open_device_negative_test_nonexistent); + ATF_TP_ADD_TC(tp, cam_open_device_negative_test_unprivileged); + ATF_TP_ADD_TC(tp, cam_open_device_positive_test); + ATF_TP_ADD_TC(tp, cam_close_device_negative_test_NULL); + ATF_TP_ADD_TC(tp, cam_getccb_positive_test); + ATF_TP_ADD_TC(tp, cam_freeccb_negative_test_NULL); + + return (atf_no_error()); +} Property changes on: head/lib/libcam/tests/libcam_test.c ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property