Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/regress/lib/libc Remove a couple tests - they've moved to atf
details: https://anonhg.NetBSD.org/src/rev/7d0b38b29f7c
branches: trunk
changeset: 760001:7d0b38b29f7c
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Thu Dec 23 15:32:03 2010 +0000
description:
Remove a couple tests - they've moved to atf
diffstat:
regress/lib/libc/Makefile | 6 +-
regress/lib/libc/div/Makefile | 11 ---
regress/lib/libc/div/div.c | 67 ------------------------
regress/lib/libc/popen/Makefile | 11 ---
regress/lib/libc/popen/popen.c | 111 ----------------------------------------
5 files changed, 3 insertions(+), 203 deletions(-)
diffs (231 lines):
diff -r fb946835747e -r 7d0b38b29f7c regress/lib/libc/Makefile
--- a/regress/lib/libc/Makefile Thu Dec 23 15:27:44 2010 +0000
+++ b/regress/lib/libc/Makefile Thu Dec 23 15:32:03 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2010/12/22 23:48:19 pgoyette Exp $
+# $NetBSD: Makefile,v 1.61 2010/12/23 15:32:03 pgoyette Exp $
SUBDIR+= _setjmp atexit citrus clone context convfp db \
- div divrem gen gdtoa getaddrinfo hsearch inet int_fmtio locale md5sha \
- nsdispatch popen pty randomid regex rpc servent setjmp sigsetjmp \
+ divrem gen gdtoa getaddrinfo hsearch inet int_fmtio locale md5sha \
+ nsdispatch pty randomid regex rpc servent setjmp sigsetjmp \
stdlib string strptime sys time
.include <bsd.own.mk>
diff -r fb946835747e -r 7d0b38b29f7c regress/lib/libc/div/Makefile
--- a/regress/lib/libc/div/Makefile Thu Dec 23 15:27:44 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2002/09/18 05:41:37 lukem Exp $
-
-NOMAN= # defined
-
-PROG= div
-WARNS?= 1
-
-regress: ${PROG}
- ./${PROG}
-
-.include <bsd.prog.mk>
diff -r fb946835747e -r 7d0b38b29f7c regress/lib/libc/div/div.c
--- a/regress/lib/libc/div/div.c Thu Dec 23 15:27:44 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/* $NetBSD: div.c,v 1.3 2008/04/28 20:23:04 martin Exp $ */
-
-/*-
- * Copyright (c) 2001 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.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define NUM 1999236
-#define DENOM 1000000
-#define QUOT 1
-#define REM 999236
-
-int
-main(void)
-{
- div_t d;
- ldiv_t ld;
- lldiv_t lld;
- int error = 0;
-
- d = div(NUM, DENOM);
- ld = ldiv(NUM, DENOM);
- lld = lldiv(NUM, DENOM);
-
- if (d.quot != QUOT || d.rem != REM) {
- fprintf(stderr, "div returned (%d, %d), expected (%d, %d)\n",
- d.quot, d.rem, QUOT, REM);
- error++;
- }
- if (ld.quot != QUOT || ld.rem != REM) {
- fprintf(stderr, "ldiv returned (%ld, %ld), expected (%d, %d)\n",
- ld.quot, ld.rem, QUOT, REM);
- error++;
- }
- if (lld.quot != QUOT || lld.rem != REM) {
- fprintf(stderr, "lldiv returned (%lld, %lld), expected (%d, %d)\n",
- lld.quot, lld.rem, QUOT, REM);
- error++;
- }
- if (error > 0)
- fprintf(stderr, "div: got %d errors\n", error);
- exit(error);
-}
diff -r fb946835747e -r 7d0b38b29f7c regress/lib/libc/popen/Makefile
--- a/regress/lib/libc/popen/Makefile Thu Dec 23 15:27:44 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2002/09/18 05:41:40 lukem Exp $
-
-NOMAN= # defined
-
-PROG= popen
-CLEANFILES+= popen.data
-
-regress: ${PROG}
- ./${PROG}
-
-.include <bsd.prog.mk>
diff -r fb946835747e -r 7d0b38b29f7c regress/lib/libc/popen/popen.c
--- a/regress/lib/libc/popen/popen.c Thu Dec 23 15:27:44 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/* $NetBSD: popen.c,v 1.4 2008/07/21 14:33:31 lukem Exp $ */
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matthias Scheler.
- *
- * 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 <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1999\
- The NetBSD Foundation, Inc. All rights reserved.");
-#endif /* not lint */
-
-#ifndef lint
-__RCSID("$NetBSD: popen.c,v 1.4 2008/07/21 14:33:31 lukem Exp $");
-#endif /* not lint */
-
-#include <sys/param.h>
-
-#include <errno.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-
-#define _PATH_CAT "/bin/cat"
-#define BUFSIZE (640*1024)
- /* 640KB ought to be enough for everyone. */
-#define DATAFILE "popen.data"
-
-int main(int, char *[]);
-
-main(argc, argv)
- int argc;
- char *argv[];
-{
- char *buffer, command[MAXPATHLEN];
- int index, in;
- FILE *pipe;
-
- if ((buffer = malloc(BUFSIZE*sizeof(char))) == NULL)
- err(1, NULL);
-
- srand ((unsigned int)time(NULL));
- for (index=0; index<BUFSIZE; index++)
- buffer[index]=(char)rand();
-
- (void)snprintf(command, sizeof(command), "%s >%s",
- _PATH_CAT, DATAFILE);
- if ((pipe = popen(command, "w")) == NULL)
- err(1, "popen write");
-
- if (fwrite(buffer, sizeof(char), BUFSIZE, pipe) != BUFSIZE)
- err(1, "write");
-
- if (pclose(pipe) == -1)
- err(1, "pclose");
-
- (void)snprintf(command, sizeof(command), "%s %s",
- _PATH_CAT, DATAFILE);
- if ((pipe = popen(command, "r")) == NULL)
- err(1, "popen read");
-
- index = 0;
- while ((in = fgetc(pipe)) != EOF)
- if (index == BUFSIZE) {
- errno = EFBIG;
- err(1, "read");
- }
- else
- if ((char)in != buffer[index++]) {
- errno = EINVAL;
- err(1, "read");
- }
-
- if (index < BUFSIZE) {
- errno = EIO;
- err(1, "read");
- }
-
- if (pclose(pipe) == -1)
- err(1, "pclose");
-
- (void)unlink(DATAFILE);
- return 0;
-}
Home |
Main Index |
Thread Index |
Old Index