Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/regress/lib/libc The last of the libc/stdlib tests have been...
details: https://anonhg.NetBSD.org/src/rev/7da8acf92c17
branches: trunk
changeset: 760262:7da8acf92c17
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Sat Jan 01 23:59:19 2011 +0000
description:
The last of the libc/stdlib tests have been atf-ified
diffstat:
regress/lib/libc/Makefile | 4 +-
regress/lib/libc/stdlib/Makefile | 5 -
regress/lib/libc/stdlib/Makefile.inc | 4 -
regress/lib/libc/stdlib/getopt/Makefile | 10 -
regress/lib/libc/stdlib/getopt/getopt.c | 127 --------
regress/lib/libc/stdlib/getopt/opttest | 22 -
regress/lib/libc/stdlib/getopt_long/Makefile | 10 -
regress/lib/libc/stdlib/getopt_long/getopt_long.c | 237 ----------------
regress/lib/libc/stdlib/getopt_long/opttest | 47 ---
regress/lib/libc/stdlib/posix_memalign/Makefile | 10 -
regress/lib/libc/stdlib/posix_memalign/posix_memalign.c | 86 -----
11 files changed, 2 insertions(+), 560 deletions(-)
diffs (truncated from 611 to 300 lines):
diff -r e25d558cea32 -r 7da8acf92c17 regress/lib/libc/Makefile
--- a/regress/lib/libc/Makefile Sat Jan 01 23:56:48 2011 +0000
+++ b/regress/lib/libc/Makefile Sat Jan 01 23:59:19 2011 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2010/12/31 14:37:37 pgoyette Exp $
+# $NetBSD: Makefile,v 1.69 2011/01/01 23:59:19 pgoyette Exp $
SUBDIR+= atexit citrus db divrem getaddrinfo int_fmtio locale md5sha \
- nsdispatch regex rpc servent stdlib sys time
+ nsdispatch regex rpc servent sys time
.include <bsd.own.mk>
.include <bsd.sys.mk>
diff -r e25d558cea32 -r 7da8acf92c17 regress/lib/libc/stdlib/Makefile
--- a/regress/lib/libc/stdlib/Makefile Sat Jan 01 23:56:48 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2008/02/03 22:56:13 christos Exp $
-
-SUBDIR+= getopt getopt_long posix_memalign
-
-.include <bsd.subdir.mk>
diff -r e25d558cea32 -r 7da8acf92c17 regress/lib/libc/stdlib/Makefile.inc
--- a/regress/lib/libc/stdlib/Makefile.inc Sat Jan 01 23:56:48 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2002/08/18 14:59:33 itojun Exp $
-#
-# do not install regression test programs
-proginstall::
diff -r e25d558cea32 -r 7da8acf92c17 regress/lib/libc/stdlib/getopt/Makefile
--- a/regress/lib/libc/stdlib/getopt/Makefile Sat Jan 01 23:56:48 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2002/11/30 03:10:53 lukem Exp $
-
-NOMAN= # defined
-
-PROG= getopt
-
-regress: ${PROG}
- ./${PROG} < ${.CURDIR}/opttest
-
-.include <bsd.prog.mk>
diff -r e25d558cea32 -r 7da8acf92c17 regress/lib/libc/stdlib/getopt/getopt.c
--- a/regress/lib/libc/stdlib/getopt/getopt.c Sat Jan 01 23:56:48 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/* $NetBSD: getopt.c,v 1.7 2008/04/28 20:23:05 martin Exp $ */
-
-/*-
- * Copyright (c) 2002 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.
- *
- * 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 <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <err.h>
-
-#define WS "\t\n "
-#define debug 0
-
-int
-main(int argc, char *argv[])
-{
- size_t len, lineno = 0;
- char *line, *ptr, *optstring = NULL, *result = NULL;
- char buf[1024];
- char *args[100];
- char arg[100];
- int nargs = -1;
- int c;
-
- while ((line = fparseln(stdin, &len, &lineno, NULL, 0)) != NULL) {
- if (strncmp(line, "load:", 5) == 0) {
- if (optstring)
- free(optstring);
- optstring = strtok(&line[6], WS);
- if (optstring == NULL)
- errx(1, "missing optstring at line %ld",
- (unsigned long)lineno);
- optstring = strdup(optstring);
- if (debug)
- fprintf(stderr, "optstring = %s\n", optstring);
- } else if (strncmp(line, "args:", 5) == 0) {
- for (; nargs >= 0; nargs--) {
- if (args[nargs] != NULL)
- free(args[nargs]);
- }
- args[nargs = 0] = strtok(&line[6], WS);
- if (args[nargs] == NULL)
- errx(1, "missing args at line %ld",
- (unsigned long)lineno);
-
- args[nargs] = strdup(args[nargs]);
- while ((args[++nargs] = strtok(NULL, WS)) != NULL)
- args[nargs] = strdup(args[nargs]);
- if (debug) {
- int i = 0;
- for (i = 0; i < nargs; i++)
- fprintf(stderr, "argv[%d] = %s\n", i,
- args[i]);
- }
- } else if (strncmp(line, "result:", 7) == 0) {
- buf[0] = '\0';
- optind = optreset = 1;
- if (result)
- free(result);
- result = strtok(&line[8], WS);
- if (result == NULL)
- errx(1, "missing result at line %ld",
- (unsigned long)lineno);
- result = strdup(result);
- if (nargs == -1)
- errx(1, "result: without args:");
- if (debug)
- fprintf(stderr, "result = %s\n", result);
- while ((c = getopt(nargs, args, optstring)) != -1) {
- if (c == ':')
- err(1, "`:' found as argument char");
- if ((ptr = strchr(optstring, c)) == NULL) {
- snprintf(arg, sizeof(arg), "!%c,", c);
- strcat(buf, arg);
- continue;
- }
- if (ptr[1] != ':')
- snprintf(arg, sizeof(arg), "%c,", c);
- else
- snprintf(arg, sizeof(arg), "%c=%s,",
- c, optarg);
- strcat(buf, arg);
- }
- len = strlen(buf);
- if (len > 0) {
- buf[len - 1] = '|';
- buf[len] = '\0';
- } else {
- buf[0] = '|';
- buf[1] = '\0';
- }
- snprintf(arg, sizeof(arg), "%d", nargs - optind);
- strcat(buf, arg);
- if (strcmp(buf, result) != 0)
- errx(1, "`%s' != `%s'", buf, result);
- }
- free(line);
- }
- return 0;
-}
diff -r e25d558cea32 -r 7da8acf92c17 regress/lib/libc/stdlib/getopt/opttest
--- a/regress/lib/libc/stdlib/getopt/opttest Sat Jan 01 23:56:48 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-load: c:d
-#
-args: foo -c 1 -d foo
-result: c=1,d|1
-#
-args: foo -d foo bar
-result: d|2
-#
-args: foo -c 2 foo bar
-result: c=2|2
-#
-args: foo -e 1 foo bar
-result: !?|3
-#
-args: foo -d -- -c 1
-result: d|2
-#
-args: foo -c- 1
-result: c=-|1
-#
-args: foo -d - 1
-result: d|2
diff -r e25d558cea32 -r 7da8acf92c17 regress/lib/libc/stdlib/getopt_long/Makefile
--- a/regress/lib/libc/stdlib/getopt_long/Makefile Sat Jan 01 23:56:48 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2007/01/18 16:29:21 ginsbach Exp $
-
-NOMAN= # defined
-
-PROG= getopt_long
-
-regress: ${PROG}
- ./${PROG} < ${.CURDIR}/opttest
-
-.include <bsd.prog.mk>
diff -r e25d558cea32 -r 7da8acf92c17 regress/lib/libc/stdlib/getopt_long/getopt_long.c
--- a/regress/lib/libc/stdlib/getopt_long/getopt_long.c Sat Jan 01 23:56:48 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,237 +0,0 @@
-/* $NetBSD: getopt_long.c,v 1.4 2008/04/28 20:23:05 martin Exp $ */
-
-/*-
- * Copyright (c) 2007 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.
- *
- * 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 <err.h>
-#include <getopt.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#define SKIPWS(p) while (isspace(*p)) p++
-#define WS "\t\n "
-
-int
-main(int argc, char *argv[])
-{
- size_t len, lineno = 0;
- char *line, *eptr, *longopt, *ptr, *optstring = NULL, *result = NULL;
- char buf[1024];
- char *args[128];
- char arg[256];
- int nargs = -1;
- int c;
- int nlongopts, maxnlongopts;
- int *longopt_flags = NULL;
- struct option *longopts = NULL;
-
- while ((line = fparseln(stdin, &len, &lineno, NULL, 0)) != NULL) {
- if (strncmp(line, "optstring:", 10) == 0) {
- if (optstring)
- free(optstring);
- optstring = strtok(&line[11], WS);
- if (optstring == NULL)
- errx(1, "missing optstring at line %ld",
- (unsigned long)lineno);
- optstring = strdup(optstring);
- } else if (strncmp(line, "longopts:", 9) == 0) {
- if (longopts) {
- int i;
- for (i = 0; i < nlongopts; i++)
- if (longopts[i].name != NULL)
- free(__UNCONST(longopts[i].name));
- free(longopts);
- }
- if (longopt_flags)
- free(longopt_flags);
- nlongopts = 0;
- ptr = strtok(&line[10], WS);
- if (ptr == NULL)
- errx(1, "missing longopts at line %ld",
- (unsigned long)lineno);
- maxnlongopts = strtoul(ptr, &eptr, 10);
- if (*eptr != '\0')
Home |
Main Index |
Thread Index |
Old Index