Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/regress/sys/net ether_aton test has been atf-ified
details: https://anonhg.NetBSD.org/src/rev/1ebd1a691e69
branches: trunk
changeset: 770781:1ebd1a691e69
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Tue Nov 01 23:07:34 2011 +0000
description:
ether_aton test has been atf-ified
diffstat:
regress/sys/net/Makefile | 4 +-
regress/sys/net/ether_aton_r/Makefile | 26 ---------
regress/sys/net/ether_aton_r/autogen | 25 --------
regress/sys/net/ether_aton_r/main.c | 98 -----------------------------------
4 files changed, 2 insertions(+), 151 deletions(-)
diffs (174 lines):
diff -r 4d74159d17ba -r 1ebd1a691e69 regress/sys/net/Makefile
--- a/regress/sys/net/Makefile Tue Nov 01 22:37:42 2011 +0000
+++ b/regress/sys/net/Makefile Tue Nov 01 23:07:34 2011 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/05/19 21:55:35 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/11/01 23:07:34 pgoyette Exp $
.include <bsd.own.mk>
-SUBDIR= bpf ether_aton_r
+SUBDIR= bpf
.include <bsd.subdir.mk>
diff -r 4d74159d17ba -r 1ebd1a691e69 regress/sys/net/ether_aton_r/Makefile
--- a/regress/sys/net/ether_aton_r/Makefile Tue Nov 01 22:37:42 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2010/12/20 16:13:44 joerg Exp $
-#
-# To use this, copy / link the cpu_in_cksum.S from the arch subdirectory
-# and copy assym.h from the build directory of a kernel.
-#
-
-NOMAN= # defined
-.include <bsd.own.mk>
-
-PROG= ether_aton_r
-SRCS= ether_aton_r.c main.c
-WARNS ?= 4
-
-CLEANFILES+=ether_aton_r.c
-
-ether_aton_r.c: autogen ${NETBSDSRCDIR}/sys/net/if_ethersubr.c
- ${HOST_SH} ${.ALLSRC} ${.TARGET}
-
-regress:
- @if ./${PROG} ; then \
- echo "PASSED"; \
- else \
- echo "FAILED"; \
- fi
-
-.include <bsd.prog.mk>
diff -r 4d74159d17ba -r 1ebd1a691e69 regress/sys/net/ether_aton_r/autogen
--- a/regress/sys/net/ether_aton_r/autogen Tue Nov 01 22:37:42 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-awk '
-BEGIN {
- print
- print "#include <ctype.h>"
- print "#include <sys/types.h>"
- print "#include <errno.h>"
- print
- print "#define ETHER_ADDR_LEN 6"
- print
- print "int ether_aton_r(u_char *dest, size_t len, const char *str);"
- print
-}
-/^ether_aton_r/ {
- print prevline
- out = 1
-}
-{
- if (out) print
- else prevline = $0
-}
-/^}$/ {
- if (out) exit(0)
-}' $1 >$2
diff -r 4d74159d17ba -r 1ebd1a691e69 regress/sys/net/ether_aton_r/main.c
--- a/regress/sys/net/ether_aton_r/main.c Tue Nov 01 22:37:42 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/* $NetBSD: main.c,v 1.3 2011/11/01 13:59:00 christos Exp $ */
-
-/*-
- * Copyright (c) 2010 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * 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.
- */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.3 2011/11/01 13:59:00 christos Exp $");
-
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <err.h>
-#include <string.h>
-#include <errno.h>
-
-#define ETHER_ADDR_LEN 6
-
-int ether_aton_r(u_char *dest, size_t len, const char *str);
-
-static const struct {
- u_char res[ETHER_ADDR_LEN];
- const char *str;
- int error;
-} tests[] = {
- { { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }, "01:23:45:67:89:ab", 0 },
- { { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, "0:1:22-3:14:05", 0 },
- { { 0x00, 0x01, 0x22, 0x03, 0x14, 0x05 }, "000122031405", 0 },
- { { 0x0a, 0x0B, 0xcc, 0xdD, 0xEE, 0x0f }, "0a0BccdDEE0f", 0 },
-#define ZERO { 0, 0, 0, 0, 0, 0 }
- { ZERO, "0:1:2-3:04:05:06", ENAMETOOLONG },
- { ZERO, "0:1:2-3:04:", ENOBUFS },
- { ZERO, "0:1:2-3:04:x7", EINVAL },
- { ZERO, "1:x-3:04:05:7", EINVAL },
- { ZERO, NULL, 0 },
-};
-int
-main(int argc, char *argv[])
-{
- u_char dest[ETHER_ADDR_LEN];
- size_t t;
- int e, r;
- const char *s;
- int error = 0;
-
- for (t = 0; tests[t].str; t++) {
- s = tests[t].str;
- if ((e = tests[t].error) == 0) {
- if (ether_aton_r(dest, sizeof(dest), s) != e) {
- error++;
- warnx("ether_aton_r failed on `%s'", s);
- }
- if (memcmp(dest, tests[t].res, sizeof(dest)) != 0) {
- error++;
- warnx("ether_aton_r unexpected result on `%s'",
- s);
- }
- } else {
- if ((r = ether_aton_r(dest, sizeof(dest), s)) != e) {
- error++;
- warnx("ether_aton_r succeeded on `%s' "
- "(%d != %d)", s, r, e);
- }
- }
- }
- return error;
-}
Home |
Main Index |
Thread Index |
Old Index