diff options
| author | jmmv <jmmv@FreeBSD.org> | 2014-04-14 13:30:08 +0000 |
|---|---|---|
| committer | jmmv <jmmv@FreeBSD.org> | 2014-04-14 13:30:08 +0000 |
| commit | d9b0a628da4b486dde00400305ad3a2ecefa0205 (patch) | |
| tree | 70bd9eedb0e9eac2ac2cd3dcfc26f48adfd1ae7a | |
| parent | bd8afe2477108733f19a3171f80f6c8d9daef3bf (diff) | |
| download | FreeBSD-src-d9b0a628da4b486dde00400305ad3a2ecefa0205.zip FreeBSD-src-d9b0a628da4b486dde00400305ad3a2ecefa0205.tar.gz | |
MFC various fixes to the tools/regression/ tests.
- r262953 Fix m4 tests so that they run cleanly with prove.
- r262954 Fix printf tests so that they run cleanly with prove.
- r262959 Fix sed tests so that they run cleanly with prove.
- r262960 Fix yacc tests so that they run cleanly with prove.
- r262961 Fix pkill tests so that they run cleanly with prove.
- r262962 Fix ncal tests so that they run cleanly with prove.
- r263081 Fix lastcomm tests under amd64.
- r263082 Only run the make tests when make is fmake.
- r263083 Fix sa tests.
- r263084 Turn a test precondition into a skip in the mdconfig tests.
- r263085 Make the strerror tests work without libtap.
- r263087 Remove broken tests for eui64_line.
- r263221 Change etcupdate tests to return 1 on test failures.
- r263352 Make the priv test program exit with non-zero if any failures are detected.
- r263353 errx prepends the program name to the message; don't do it by hand.
- r263362 Include strings.h so that bpf_filter.c can be built in userland.
55 files changed, 715 insertions, 683 deletions
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c index 672dfaa..40498a9 100644 --- a/sys/net/bpf_filter.c +++ b/sys/net/bpf_filter.c @@ -39,6 +39,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#if !defined(_KERNEL) +#include <strings.h> +#endif #if !defined(_KERNEL) || defined(sun) #include <netinet/in.h> #endif diff --git a/tools/regression/lib/libc/net/Makefile b/tools/regression/lib/libc/net/Makefile index a61741b..4f19edf 100644 --- a/tools/regression/lib/libc/net/Makefile +++ b/tools/regression/lib/libc/net/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTS= test-ether test-eui64_aton test-eui64_line test-eui64_ntoa +TESTS= test-ether test-eui64_aton test-eui64_ntoa CFLAGS+= -g -Wall .PHONY: tests diff --git a/tools/regression/lib/libc/net/test-eui64_line.c b/tools/regression/lib/libc/net/test-eui64_line.c deleted file mode 100644 index 714b460..0000000 --- a/tools/regression/lib/libc/net/test-eui64_line.c +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2004 The Aerospace Corporation. 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. - * 3. The name of The Aerospace Corporation may not be used to endorse or - * promote products derived from this software. - * - * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "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 AEROSPACE CORPORATION 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 <sys/types.h> -#include <sys/eui64.h> -#include <stdio.h> -#include <string.h> - -#include "test-eui64.h" - -static int -test_line(const char *line, const struct eui64 *eui, const char *host) -{ - struct eui64 e; - char buf[256]; - static int test = 0; - - test++; - - if (eui64_line(line, &e, buf, sizeof(buf)) != 0 || - memcmp(&e, eui, sizeof(struct eui64)) != 0 || - strcmp(buf, host) != 0) { - printf("not ok %d - eui64_line(\"%s\")\n", test, line); - printf("# host = %s\n", buf); - eui64_ntoa(&e, buf, sizeof(buf)); - printf("# e = %s\n", buf); - return (0); - } else { - printf("ok %d - eui64_line(\"%s\")\n", test, line); - return (1); - } -} - -int -main(int argc, char **argv) -{ - - printf("1..6\n"); - - test_line(test_eui64_line_id, &test_eui64_id, - test_eui64_id_host); - test_line(test_eui64_line_id_colon, &test_eui64_id, - test_eui64_id_host); - test_line(test_eui64_line_eui48, &test_eui64_eui48, - test_eui64_eui48_host); - test_line(test_eui64_line_mac48, &test_eui64_mac48, - test_eui64_mac48_host); - test_line(test_eui64_line_eui48_6byte, &test_eui64_eui48, - test_eui64_eui48_host); - test_line(test_eui64_line_eui48_6byte_c, &test_eui64_eui48, - test_eui64_eui48_host); - - return (0); -} diff --git a/tools/regression/lib/libc/net/test-eui64_line.t b/tools/regression/lib/libc/net/test-eui64_line.t deleted file mode 100644 index 8bdfd03..0000000 --- a/tools/regression/lib/libc/net/test-eui64_line.t +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -cd `dirname $0` - -executable=`basename $0 .t` - -make $executable 2>&1 > /dev/null - -exec ./$executable diff --git a/tools/regression/lib/libc/string/Makefile b/tools/regression/lib/libc/string/Makefile index 59388b6..2c34ca3 100644 --- a/tools/regression/lib/libc/string/Makefile +++ b/tools/regression/lib/libc/string/Makefile @@ -1,9 +1,5 @@ # $FreeBSD$ -CFLAGS+= -I/usr/local/include -LDFLAGS+= -L/usr/local/lib -LDLIBS= -ltap - TESTS= test-stpncpy test-strerror test-wcscasecmp test-wcsnlen .PHONY: tests diff --git a/tools/regression/lib/libc/string/test-strerror.c b/tools/regression/lib/libc/string/test-strerror.c index ffc1633..84e1b45 100644 --- a/tools/regression/lib/libc/string/test-strerror.c +++ b/tools/regression/lib/libc/string/test-strerror.c @@ -33,7 +33,19 @@ #include <stdlib.h> #include <string.h> -#include <tap.h> +static int test_count = 1; +static int exit_status = EXIT_SUCCESS; + +#define CHECK(x) \ + do { \ + if (x) { \ + printf("ok %d\n", test_count); \ + } else { \ + printf("not ok %d # %s\n", test_count, #x); \ + exit_status = EXIT_FAILURE; \ + } \ + ++test_count; \ + } while (0) int main(void) @@ -42,7 +54,7 @@ main(void) char *sret; int iret; - plan_tests(27); + printf("1..27\n"); /* * strerror() failure tests. @@ -50,86 +62,86 @@ main(void) errno = 0; sret = strerror(INT_MAX); snprintf(buf, sizeof(buf), "Unknown error: %d", INT_MAX); - ok1(strcmp(sret, buf) == 0); - ok1(errno == EINVAL); + CHECK(strcmp(sret, buf) == 0); + CHECK(errno == EINVAL); /* * strerror() success tests. */ errno = 0; sret = strerror(0); - ok1(strcmp(sret, "No error: 0") == 0); - ok1(errno == 0); + CHECK(strcmp(sret, "No error: 0") == 0); + CHECK(errno == 0); errno = 0; sret = strerror(EPERM); - ok1(strcmp(sret, "Operation not permitted") == 0); - ok1(errno == 0); + CHECK(strcmp(sret, "Operation not permitted") == 0); + CHECK(errno == 0); errno = 0; sret = strerror(EPFNOSUPPORT); - ok1(strcmp(sret, "Protocol family not supported") == 0); - ok1(errno == 0); + CHECK(strcmp(sret, "Protocol family not supported") == 0); + CHECK(errno == 0); errno = 0; sret = strerror(ELAST); - ok1(errno == 0); + CHECK(errno == 0); /* * strerror_r() failure tests. */ memset(buf, '*', sizeof(buf)); iret = strerror_r(-1, buf, sizeof(buf)); - ok1(strcmp(buf, "Unknown error: -1") == 0); - ok1(iret == EINVAL); + CHECK(strcmp(buf, "Unknown error: -1") == 0); + CHECK(iret == EINVAL); memset(buf, '*', sizeof(buf)); /* One byte too short. */ iret = strerror_r(EPERM, buf, strlen("Operation not permitted")); - ok1(strcmp(buf, "Operation not permitte") == 0); - ok1(iret == ERANGE); + CHECK(strcmp(buf, "Operation not permitte") == 0); + CHECK(iret == ERANGE); memset(buf, '*', sizeof(buf)); /* One byte too short. */ iret = strerror_r(-1, buf, strlen("Unknown error: -1")); - ok1(strcmp(buf, "Unknown error: -") == 0); - ok1(iret == EINVAL); + CHECK(strcmp(buf, "Unknown error: -") == 0); + CHECK(iret == EINVAL); memset(buf, '*', sizeof(buf)); /* Two bytes too short. */ iret = strerror_r(-2, buf, strlen("Unknown error: -2") - 1); - ok1(strcmp(buf, "Unknown error: ") == 0); - ok1(iret == EINVAL); + CHECK(strcmp(buf, "Unknown error: ") == 0); + CHECK(iret == EINVAL); memset(buf, '*', sizeof(buf)); /* Three bytes too short. */ iret = strerror_r(-2, buf, strlen("Unknown error: -2") - 2); - ok1(strcmp(buf, "Unknown error:") == 0); - ok1(iret == EINVAL); + CHECK(strcmp(buf, "Unknown error:") == 0); + CHECK(iret == EINVAL); memset(buf, '*', sizeof(buf)); /* One byte too short. */ iret = strerror_r(12345, buf, strlen("Unknown error: 12345")); - ok1(strcmp(buf, "Unknown error: 1234") == 0); - ok1(iret == EINVAL); + CHECK(strcmp(buf, "Unknown error: 1234") == 0); + CHECK(iret == EINVAL); /* * strerror_r() success tests. */ memset(buf, '*', sizeof(buf)); iret = strerror_r(0, buf, sizeof(buf)); - ok1(strcmp(buf, "No error: 0") == 0); - ok1(iret == 0); + CHECK(strcmp(buf, "No error: 0") == 0); + CHECK(iret == 0); memset(buf, '*', sizeof(buf)); iret = strerror_r(EDEADLK, buf, sizeof(buf)); - ok1(strcmp(buf, "Resource deadlock avoided") == 0); - ok1(iret == 0); + CHECK(strcmp(buf, "Resource deadlock avoided") == 0); + CHECK(iret == 0); memset(buf, '*', sizeof(buf)); iret = strerror_r(EPROCLIM, buf, sizeof(buf)); - ok1(strcmp(buf, "Too many processes") == 0); - ok1(iret == 0); + CHECK(strcmp(buf, "Too many processes") == 0); + CHECK(iret == 0); - return exit_status(); + return exit_status; } diff --git a/tools/regression/priv/main.c b/tools/regression/priv/main.c index e594c44..74b7b2f 100644 --- a/tools/regression/priv/main.c +++ b/tools/regression/priv/main.c @@ -53,6 +53,16 @@ #include "main.h" /* + * If true, some test or preparatory step failed along the execution of this + * program. + * + * Intuitively, we would define a counter instead of a boolean. However, + * we fork to run the subtests and keeping proper track of the number of + * failed tests would be tricky and not provide any real value. + */ +static int something_failed = 0; + +/* * Registration table of privilege tests. Each test registers a name, a test * function, and a cleanup function to run after the test has completed, * regardless of success/failure. @@ -358,13 +368,18 @@ expect(const char *test, int error, int expected_error, int expected_errno) { if (error == 0) { - if (expected_error != 0) + if (expected_error != 0) { + something_failed = 1; warnx("%s: returned 0", test); + } } else { - if (expected_error == 0) + if (expected_error == 0) { + something_failed = 1; warn("%s: returned (%d, %d)", test, error, errno); - else if (expected_errno != errno) + } else if (expected_errno != errno) { + something_failed = 1; warn("%s: returned (%d, %d)", test, error, errno); + } } } @@ -488,14 +503,24 @@ run(struct test *test, int asroot, int injail) run_child(test, asroot, injail); fflush(stdout); fflush(stderr); - exit(0); + exit(something_failed ? EXIT_FAILURE : EXIT_SUCCESS); } else { while (1) { - pid = waitpid(childpid, NULL, 0); - if (pid == -1) + int status; + pid = waitpid(childpid, &status, 0); + if (pid == -1) { + something_failed = 1; warn("test: waitpid %s", test->t_name); - if (pid == childpid) + } + if (pid == childpid) { + if (WIFEXITED(status) && + WEXITSTATUS(status) == EXIT_SUCCESS) { + /* All good in the subprocess! */ + } else { + something_failed = 1; + } break; + } } } fflush(stdout); @@ -518,7 +543,7 @@ main(int argc, char *argv[]) * force the use of privilege, and will likely need checking. */ if (getuid() != 0 && geteuid() != 0) - errx(-1, "priv: must be run as root"); + errx(-1, "must be run as root"); /* * Run each test four times, varying whether the process is running @@ -530,5 +555,5 @@ main(int argc, char *argv[]) run(&tests[i], 1, 0); run(&tests[i], 1, 1); } - return (0); + return (something_failed ? EXIT_FAILURE : EXIT_SUCCESS); } diff --git a/tools/regression/sbin/mdconfig/00.t b/tools/regression/sbin/mdconfig/00.t index 94d1934..04e6d00 100644 --- a/tools/regression/sbin/mdconfig/00.t +++ b/tools/regression/sbin/mdconfig/00.t @@ -32,8 +32,8 @@ echo "1..1" if [ `whoami` != "root" ]; then - echo "not ok 1 - you need to be root to run this test." - exit 1 + echo "ok 1 # skip You need to be root to run this test." + exit 0 fi TESTDIR=$(dirname $(realpath $0)) diff --git a/tools/regression/usr.bin/lastcomm/regress.t b/tools/regression/usr.bin/lastcomm/regress.t index 6abca0b..d733dbc 100755 --- a/tools/regression/usr.bin/lastcomm/regress.t +++ b/tools/regression/usr.bin/lastcomm/regress.t @@ -6,6 +6,8 @@ DIR=`dirname $0` ARCH=`uname -m` +TZ=UTC; export TZ + check() { NUM=$1 diff --git a/tools/regression/usr.bin/lastcomm/v1-amd64.out b/tools/regression/usr.bin/lastcomm/v1-amd64.out index c0a379f..bacbd57 100644 --- a/tools/regression/usr.bin/lastcomm/v1-amd64.out +++ b/tools/regression/usr.bin/lastcomm/v1-amd64.out @@ -1,28 +1,28 @@ -core -FDX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -core -DX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -cc - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 06:44 -ld - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -as - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -cc1 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.234 es Wed May 16 06:44 -diff - root 0.203 secs 0.203 us 0.000 sy 0.234 es Wed May 16 06:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 06:44 -dd - root 0.016 secs 0.000 us 0.016 sy 0.016 es Wed May 16 06:44 -time - root 0.000 secs 0.000 us 0.000 sy 3.016 es Wed May 16 06:44 -sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Wed May 16 06:44 -time - root 0.000 secs 0.000 us 0.000 sy 1.938 es Wed May 16 06:44 -find - root 0.250 secs 0.031 us 0.219 sy 1.938 es Wed May 16 06:44 -time - root 0.000 secs 0.000 us 0.000 sy 3.062 es Wed May 16 06:44 -egrep - root 3.031 secs 3.031 us 0.000 sy 3.062 es Wed May 16 06:44 -time - root 0.000 secs 0.000 us 0.000 sy 0.188 es Wed May 16 06:44 -awk - root 0.172 secs 0.172 us 0.000 sy 0.188 es Wed May 16 06:44 -accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44 +core -FDX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +core -DX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +cc - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 11:44 +ld - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +as - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +cc1 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 +time - root 0.000 secs 0.000 us 0.000 sy 0.234 es Wed May 16 11:44 +diff - root 0.203 secs 0.203 us 0.000 sy 0.234 es Wed May 16 11:44 +time - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 11:44 +dd - root 0.016 secs 0.000 us 0.016 sy 0.016 es Wed May 16 11:44 +time - root 0.000 secs 0.000 us 0.000 sy 3.016 es Wed May 16 11:44 +sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Wed May 16 11:44 +time - root 0.000 secs 0.000 us 0.000 sy 1.938 es Wed May 16 11:44 +find - root 0.250 secs 0.031 us 0.219 sy 1.938 es Wed May 16 11:44 +time - root 0.000 secs 0.000 us 0.000 sy 3.062 es Wed May 16 11:44 +egrep - root 3.031 secs 3.031 us 0.000 sy 3.062 es Wed May 16 11:44 +time - root 0.000 secs 0.000 us 0.000 sy 0.188 es Wed May 16 11:44 +awk - root 0.172 secs 0.172 us 0.000 sy 0.188 es Wed May 16 11:44 +accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44 diff --git a/tools/regression/usr.bin/lastcomm/v2-amd64.out b/tools/regression/usr.bin/lastcomm/v2-amd64.out index 5795e63..3942b04 100644 --- a/tools/regression/usr.bin/lastcomm/v2-amd64.out +++ b/tools/regression/usr.bin/lastcomm/v2-amd64.out @@ -1,28 +1,28 @@ -core -FDX root 0.002 secs 0.000 us 0.002 sy 0.009 es Thu May 17 00:57 -core -DX root 0.005 secs 0.000 us 0.005 sy 0.010 es Thu May 17 00:57 -cc - root 0.005 secs 0.000 us 0.005 sy 0.652 es Thu May 17 00:57 -ld - root 0.014 secs 0.005 us 0.009 sy 0.150 es Thu May 17 00:57 -as - root 0.005 secs 0.000 us 0.005 sy 0.078 es Thu May 17 00:57 -cc1 - root 0.024 secs 0.008 us 0.016 sy 0.347 es Thu May 17 00:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.005 es Thu May 17 00:57 -1234567890123456 - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 00:57 -ln - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 00:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.005 es Thu May 17 00:57 -1234567890123456 - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 00:57 -ln - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 00:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.013 es Thu May 17 00:57 -123456789012345 - root 0.002 secs 0.000 us 0.002 sy 0.010 es Thu May 17 00:57 -ln - root 0.003 secs 0.000 us 0.003 sy 0.003 es Thu May 17 00:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.246 es Thu May 17 00:57 -diff - root 0.223 secs 0.164 us 0.060 sy 0.243 es Thu May 17 00:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.079 es Thu May 17 00:57 -dd - root 0.076 secs 0.000 us 0.076 sy 0.076 es Thu May 17 00:57 -time - root 0.004 secs 0.000 us 0.004 sy 3.006 es Thu May 17 00:57 -sleep - root 0.002 secs 0.000 us 0.002 sy 3.002 es Thu May 17 00:57 -time - root 0.003 secs 0.000 us 0.003 sy 9.945 es Thu May 17 00:57 -find - root 0.822 secs 0.055 us 0.767 sy 9.942 es Thu May 17 00:57 -time - root 0.003 secs 0.000 us 0.003 sy 3.313 es Thu May 17 00:57 -egrep - root 3.247 secs 3.247 us 0.000 sy 3.310 es Thu May 17 00:57 -time - root 0.003 secs 0.000 us 0.003 sy 0.185 es Thu May 17 00:57 -awk - root 0.163 secs 0.156 us 0.007 sy 0.164 es Thu May 17 00:57 -accton - root 0.002 secs 0.000 us 0.002 sy 0.019 es Thu May 17 00:57 +core -FDX root 0.002 secs 0.000 us 0.002 sy 0.009 es Thu May 17 05:57 +core -DX root 0.005 secs 0.000 us 0.005 sy 0.010 es Thu May 17 05:57 +cc - root 0.005 secs 0.000 us 0.005 sy 0.652 es Thu May 17 05:57 +ld - root 0.014 secs 0.005 us 0.009 sy 0.150 es Thu May 17 05:57 +as - root 0.005 secs 0.000 us 0.005 sy 0.078 es Thu May 17 05:57 +cc1 - root 0.024 secs 0.008 us 0.016 sy 0.347 es Thu May 17 05:57 +time - root 0.003 secs 0.000 us 0.003 sy 0.005 es Thu May 17 05:57 +1234567890123456 - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57 +ln - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57 +time - root 0.003 secs 0.000 us 0.003 sy 0.005 es Thu May 17 05:57 +1234567890123456 - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57 +ln - root 0.002 secs 0.000 us 0.002 sy 0.002 es Thu May 17 05:57 +time - root 0.003 secs 0.000 us 0.003 sy 0.013 es Thu May 17 05:57 +123456789012345 - root 0.002 secs 0.000 us 0.002 sy 0.010 es Thu May 17 05:57 +ln - root 0.003 secs 0.000 us 0.003 sy 0.003 es Thu May 17 05:57 +time - root 0.003 secs 0.000 us 0.003 sy 0.246 es Thu May 17 05:57 +diff - root 0.223 secs 0.164 us 0.060 sy 0.243 es Thu May 17 05:57 +time - root 0.003 secs 0.000 us 0.003 sy 0.079 es Thu May 17 05:57 +dd - root 0.076 secs 0.000 us 0.076 sy 0.076 es Thu May 17 05:57 +time - root 0.004 secs 0.000 us 0.004 sy 3.006 es Thu May 17 05:57 +sleep - root 0.002 secs 0.000 us 0.002 sy 3.002 es Thu May 17 05:57 +time - root 0.003 secs 0.000 us 0.003 sy 9.945 es Thu May 17 05:57 +find - root 0.822 secs 0.055 us 0.767 sy 9.942 es Thu May 17 05:57 +time - root 0.003 secs 0.000 us 0.003 sy 3.313 es Thu May 17 05:57 +egrep - root 3.247 secs 3.247 us 0.000 sy 3.310 es Thu May 17 05:57 +time - root 0.003 secs 0.000 us 0.003 sy 0.185 es Thu May 17 05:57 +awk - root 0.163 secs 0.156 us 0.007 sy 0.164 es Thu May 17 05:57 +accton - root 0.002 secs 0.000 us 0.002 sy 0.019 es Thu May 17 05:57 diff --git a/tools/regression/usr.bin/m4/regress.gnusofterror.out b/tools/regression/usr.bin/m4/regress.gnusofterror.out index 8baef1b..322fa4c 100644 --- a/tools/regression/usr.bin/m4/regress.gnusofterror.out +++ b/tools/regression/usr.bin/m4/regress.gnusofterror.out @@ -1 +1,2 @@ +m4: gnusofterror.m4 at line 3: include(hey I do not exit): No such file or directory abc diff --git a/tools/regression/usr.bin/m4/regress.sh b/tools/regression/usr.bin/m4/regress.sh index 198cfa2..6f22f7d 100644 --- a/tools/regression/usr.bin/m4/regress.sh +++ b/tools/regression/usr.bin/m4/regress.sh @@ -2,7 +2,7 @@ LC_ALL=C; export LC_ALL -echo 1..22 +echo 1..21 REGRESSION_START($1) @@ -17,7 +17,7 @@ REGRESSION_TEST(`gnuformat', `m4 -g gnuformat.m4') REGRESSION_TEST(`gnupatterns', `m4 -g gnupatterns.m4') REGRESSION_TEST(`gnupatterns2', `m4 -g gnupatterns2.m4') REGRESSION_TEST(`gnuprefix', `m4 -P gnuprefix.m4 2>&1') -REGRESSION_TEST(`gnusofterror', `m4 -g gnusofterror.m4') +REGRESSION_TEST(`gnusofterror', `m4 -g gnusofterror.m4 2>&1') REGRESSION_TEST(`gnutranslit2', `m4 -g translit2.m4') REGRESSION_TEST(`includes', `m4 -I. includes.m4') REGRESSION_TEST(`m4wrap3', `m4 m4wrap3.m4') diff --git a/tools/regression/usr.bin/m4/regress.t b/tools/regression/usr.bin/m4/regress.t index c36d834..a82aacd 100644 --- a/tools/regression/usr.bin/m4/regress.t +++ b/tools/regression/usr.bin/m4/regress.t @@ -3,4 +3,4 @@ cd `dirname $0` -sh regress.sh +m4 ../regress.m4 regress.sh | sh diff --git a/tools/regression/usr.bin/make/common.sh b/tools/regression/usr.bin/make/common.sh index f38467f..cc7622e 100644 --- a/tools/regression/usr.bin/make/common.sh +++ b/tools/regression/usr.bin/make/common.sh @@ -13,6 +13,13 @@ fatal() exit 1 } +make_is_fmake() { + # This test is not very reliable but works for now: the old fmake + # does have a -v option while bmake doesn't. + ${MAKE_PROG} -f Makefile.non-existent -v 2>&1 | \ + grep -q "cannot open.*non-existent" +} + # # Check whether the working directory exists - it must. # @@ -322,19 +329,25 @@ eval_compare() while [ ${N} -le ${TEST_N} ] ; do fail= todo= + skip= if ! skip_test ${N} ; then do_compare stdout ${N} || fail="${fail}stdout " do_compare stderr ${N} || fail="${fail}stderr " do_compare status ${N} || fail="${fail}status " eval todo=\${TEST_${N}_TODO} + else + eval skip=\${TEST_${N}_SKIP} fi if [ ! -z "$fail" ]; then echo -n "not " fi echo -n "ok ${N} ${SUBDIR}/${N}" - if [ ! -z "$fail" -o ! -z "$todo" ]; then + if [ ! -z "$fail" -o ! -z "$todo" -o ! -z "$skip" ]; then echo -n " # " fi + if [ ! -z "$skip" ] ; then + echo -n "skip $skip; " + fi if [ ! -z "$todo" ] ; then echo -n "TODO $todo; " fi @@ -473,6 +486,12 @@ eval_cmd() set -- prove fi + if ! make_is_fmake ; then + for i in $(jot ${TEST_N:-1}) ; do + eval TEST_${i}_SKIP=\"make is not fmake\" + done + fi + for i do case $i in diff --git a/tools/regression/usr.bin/ncal/regress.sh b/tools/regression/usr.bin/ncal/regress.sh index 3dc188d..709744f 100644 --- a/tools/regression/usr.bin/ncal/regress.sh +++ b/tools/regression/usr.bin/ncal/regress.sh @@ -6,6 +6,8 @@ NCAL="${CAL_BIN} -N" YEARS="2008 2009 2010 2011" ONEYEAR="2009" +echo 1..89 + REGRESSION_START($1) # @@ -15,8 +17,6 @@ REGRESSION_START($1) # Full year calendars -echo 1..16 - for y in ${YEARS}; do # Regular calendar, Month days, No-highlight REGRESSION_TEST(`r-y${y}-md-nhl', `$NCAL -h ${y}') @@ -30,8 +30,6 @@ done # 3 month calendars -echo 17 .. 29 - for m in $(jot -w %02d 12); do # Regular calendar, Month days, No-highlight REGRESSION_TEST(`r-3m${ONEYEAR}${m}-md-nhl', diff --git a/tools/regression/usr.bin/pkill/pgrep-_s.t b/tools/regression/usr.bin/pkill/pgrep-_s.t index 5ce98e6..ce0bde3 100644 --- a/tools/regression/usr.bin/pkill/pgrep-_s.t +++ b/tools/regression/usr.bin/pkill/pgrep-_s.t @@ -5,15 +5,17 @@ base=`basename $0` echo "1..2" +exp_pid="$(ps ax | grep '\[idle\]' | awk '{print $1}')" + name="pgrep -S" -pid=`pgrep -Sx g_event` -if [ "$pid" = "2" ]; then +pid=`pgrep -Sx idle` +if [ "$pid" = "$exp_pid" ]; then echo "ok 1 - $name" else echo "not ok 1 - $name" fi -pid=`pgrep -x g_event` -if [ "$pid" != "2" ]; then +pid=`pgrep -x idle` +if [ "$pid" != "$exp_pid" ]; then echo "ok 2 - $name" else echo "not ok 2 - $name" diff --git a/tools/regression/usr.bin/printf/regress.sh b/tools/regression/usr.bin/printf/regress.sh index 3f7f9aa..84e183b 100644 --- a/tools/regression/usr.bin/printf/regress.sh +++ b/tools/regression/usr.bin/printf/regress.sh @@ -2,7 +2,7 @@ REGRESSION_START($1) -echo '1..12' +echo '1..15' REGRESSION_TEST(`b', `printf "abc%b%b" "def\n" "\cghi"') REGRESSION_TEST(`d', `printf "%d,%5d,%.5d,%0*d,%.*d\n" 123 123 123 5 123 5 123') diff --git a/tools/regression/usr.bin/sed/regress.sh b/tools/regression/usr.bin/sed/regress.sh index 37dc037..c4c2a33 100644 --- a/tools/regression/usr.bin/sed/regress.sh +++ b/tools/regression/usr.bin/sed/regress.sh @@ -2,7 +2,7 @@ REGRESSION_START($1) -echo '1..25' +echo '1..26' REGRESSION_TEST(`G', `sed G < regress.in') REGRESSION_TEST(`P', `sed P < regress.in') diff --git a/tools/regression/usr.bin/yacc/regress.00.out b/tools/regression/usr.bin/yacc/regress.00.out index f785627..39a8ca2 100644 --- a/tools/regression/usr.bin/yacc/regress.00.out +++ b/tools/regression/usr.bin/yacc/regress.00.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -77,10 +78,11 @@ static const short yycheck[] = { -1, #define YYDEBUG 0 #endif #define YYMAXTOKEN 0 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { -"end-of-file", +"end-of-file","illegal-symbol", }; static const char *yyrule[] = { "$accept : rule", @@ -105,12 +107,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -145,7 +147,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -219,9 +221,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -303,9 +303,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -348,9 +346,7 @@ yyreduce: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.01.out b/tools/regression/usr.bin/yacc/regress.01.out index cc4845e..8187502 100644 --- a/tools/regression/usr.bin/yacc/regress.01.out +++ b/tools/regression/usr.bin/yacc/regress.01.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -25,7 +26,7 @@ int base; extern int yylex(void); static void yyerror(const char *s); -#line 28 "/dev/stdout" +#line 29 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -152,6 +153,7 @@ static const short yycheck[] = { 40, #define YYDEBUG 0 #endif #define YYMAXTOKEN 259 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -162,7 +164,7 @@ static const char *yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,"DIGIT","LETTER","UMINUS", +0,0,0,0,0,0,"DIGIT","LETTER","UMINUS","illegal-symbol", }; static const char *yyrule[] = { "$accept : list", @@ -204,12 +206,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -263,7 +265,7 @@ yylex(void) } return( c ); } -#line 266 "/dev/stdout" +#line 267 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -287,7 +289,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -361,9 +363,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -445,9 +445,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -529,7 +527,7 @@ case 18: #line 63 "calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } break; -#line 532 "/dev/stdout" +#line 529 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -551,9 +549,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.02.out b/tools/regression/usr.bin/yacc/regress.02.out index c0e7a75..30de536 100644 --- a/tools/regression/usr.bin/yacc/regress.02.out +++ b/tools/regression/usr.bin/yacc/regress.02.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -55,7 +56,7 @@ typedef union INTERVAL vval; } YYSTYPE; #endif /* !YYSTYPE_IS_DECLARED */ -#line 58 "/dev/stdout" +#line 59 "/dev/stdout" /* compatibility with bison */ #ifdef YYPARSE_PARAM @@ -192,6 +193,7 @@ static const short yycheck[] = { 40, #define YYDEBUG 0 #endif #define YYMAXTOKEN 260 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -202,7 +204,7 @@ static const char *yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,"DREG","VREG","CONST","UMINUS", +0,0,"DREG","VREG","CONST","UMINUS","illegal-symbol", }; static const char *yyrule[] = { "$accept : line", @@ -254,12 +256,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -402,7 +404,7 @@ vdiv(double a, double b, INTERVAL v) { return (hilo(a / v.hi, a / v.lo, b / v.hi, b / v.lo)); } -#line 405 "/dev/stdout" +#line 406 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -426,7 +428,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -500,9 +502,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -584,9 +584,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -771,7 +769,7 @@ case 28: yyval.vval = yystack.l_mark[-1].vval; } break; -#line 774 "/dev/stdout" +#line 771 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -793,9 +791,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.03.out b/tools/regression/usr.bin/yacc/regress.03.out index 55ed6ae..a8c9f8c 100644 --- a/tools/regression/usr.bin/yacc/regress.03.out +++ b/tools/regression/usr.bin/yacc/regress.03.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -28,7 +29,7 @@ int YYLEX_DECL(); static void YYERROR_DECL(); #endif -#line 31 "/dev/stdout" +#line 32 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -159,6 +160,7 @@ static const short yycheck[] = { 40, #define YYDEBUG 0 #endif #define YYMAXTOKEN 259 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -169,7 +171,7 @@ static const char *yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,"DIGIT","LETTER","UMINUS", +0,0,0,0,0,0,"DIGIT","LETTER","UMINUS","illegal-symbol", }; static const char *yyrule[] = { "$accept : list", @@ -206,12 +208,12 @@ int yynerrs; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -270,7 +272,7 @@ YYLEX_DECL() } return( c ); } -#line 273 "/dev/stdout" +#line 274 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -294,7 +296,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -375,9 +377,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -459,9 +459,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -543,7 +541,7 @@ case 18: #line 73 "calc3.y" { yyval = (*base) * yystack.l_mark[-1] + yystack.l_mark[0]; } break; -#line 546 "/dev/stdout" +#line 543 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -565,9 +563,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.04.out b/tools/regression/usr.bin/yacc/regress.04.out index d9a2006..cd93e86 100644 --- a/tools/regression/usr.bin/yacc/regress.04.out +++ b/tools/regression/usr.bin/yacc/regress.04.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -27,7 +28,7 @@ int yylex(void); static void yyerror(const char *s); #endif -#line 30 "/dev/stdout" +#line 31 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -154,6 +155,7 @@ static const short yycheck[] = { 40, #define YYDEBUG 0 #endif #define YYMAXTOKEN 259 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -164,7 +166,7 @@ static const char *yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,"DIGIT","LETTER","UMINUS", +0,0,0,0,0,0,"DIGIT","LETTER","UMINUS","illegal-symbol", }; static const char *yyrule[] = { "$accept : list", @@ -206,12 +208,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -269,7 +271,7 @@ yylex(void) } return( c ); } -#line 272 "/dev/stdout" +#line 273 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -293,7 +295,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -367,9 +369,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -451,9 +451,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -535,7 +533,7 @@ case 18: #line 65 "code_calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } break; -#line 538 "/dev/stdout" +#line 535 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -557,9 +555,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.05.out b/tools/regression/usr.bin/yacc/regress.05.out index 3f643db..2fbf0d9 100644 --- a/tools/regression/usr.bin/yacc/regress.05.out +++ b/tools/regression/usr.bin/yacc/regress.05.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -22,7 +23,7 @@ int yylex(void); static void yyerror(const char *); #endif -#line 25 "/dev/stdout" +#line 26 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -89,10 +90,11 @@ static const short yycheck[] = { 256, #define YYDEBUG 0 #endif #define YYMAXTOKEN 0 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { -"end-of-file", +"end-of-file","illegal-symbol", }; static const char *yyrule[] = { "$accept : S", @@ -117,12 +119,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -160,7 +162,7 @@ yyerror(const char* s) { printf("%s\n", s); } -#line 163 "/dev/stdout" +#line 164 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -184,7 +186,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -258,9 +260,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -342,9 +342,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -387,9 +385,7 @@ yyreduce: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.06.out b/tools/regression/usr.bin/yacc/regress.06.out index 1dc80eb..d2305e1 100644 --- a/tools/regression/usr.bin/yacc/regress.06.out +++ b/tools/regression/usr.bin/yacc/regress.06.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -18,7 +19,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #line 2 "error.y" int yylex(void); static void yyerror(const char *); -#line 21 "/dev/stdout" +#line 22 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -85,10 +86,11 @@ static const short yycheck[] = { 256, #define YYDEBUG 0 #endif #define YYMAXTOKEN 0 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { -"end-of-file", +"end-of-file","illegal-symbol", }; static const char *yyrule[] = { "$accept : S", @@ -113,12 +115,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -152,7 +154,7 @@ yyerror(const char* s) { printf("%s\n", s); } -#line 155 "/dev/stdout" +#line 156 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -176,7 +178,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -250,9 +252,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -334,9 +334,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -379,9 +377,7 @@ yyreduce: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.07.out b/tools/regression/usr.bin/yacc/regress.07.out index de06e38..ae185a0 100644 --- a/tools/regression/usr.bin/yacc/regress.07.out +++ b/tools/regression/usr.bin/yacc/regress.07.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -114,7 +115,7 @@ yyerror(const char *msg) { perror(msg); } -#line 117 "/dev/stdout" +#line 118 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -357,6 +358,7 @@ static const short yycheck[] = { 89, #define YYDEBUG 0 #endif #define YYMAXTOKEN 319 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -372,6 +374,7 @@ static const char *yyname[] = { "MAIL","MSND","MSOM","MSAM","MRSQ","MRCP","ALLO","REST","RNFR","RNTO","ABOR", "DELE","CWD","LIST","NLST","SITE","STAT","HELP","NOOP","MKD","RMD","PWD","CDUP", "STOU","SMNT","SYST","SIZE","MDTM","UMASK","IDLE","CHMOD","LEXERR", +"illegal-symbol", }; static const char *yyrule[] = { "$accept : cmd_list", @@ -468,12 +471,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -1008,7 +1011,7 @@ sizecmd(char *filename) reply(504, "SIZE not implemented for Type %c.", "?AEIL"[type]); } } -#line 1011 "/dev/stdout" +#line 1013 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -1032,7 +1035,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -1106,9 +1109,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -1190,9 +1191,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -1851,7 +1850,7 @@ case 73: } } break; -#line 1854 "/dev/stdout" +#line 1852 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -1873,9 +1872,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.08.out b/tools/regression/usr.bin/yacc/regress.08.out index c86f19f..d5d3ae0 100644 --- a/tools/regression/usr.bin/yacc/regress.08.out +++ b/tools/regression/usr.bin/yacc/regress.08.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -302,7 +303,7 @@ haveAnsiParam (void) } return FALSE; } -#line 305 "/dev/stdout" +#line 306 "/dev/stdout" /* compatibility with bison */ #ifdef YYPARSE_PARAM @@ -660,6 +661,7 @@ static const short yycheck[] = { 38, #define YYDEBUG 0 #endif #define YYMAXTOKEN 291 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -676,6 +678,7 @@ static const char *yyname[] = { "T_UNSIGNED","T_ENUM","T_STRUCT","T_UNION","T_Bool","T_Complex","T_Imaginary", "T_TYPE_QUALIFIER","T_BRACKETS","T_LBRACE","T_MATCHRBRACE","T_ELLIPSIS", "T_INITIALIZER","T_STRING_LITERAL","T_ASM","T_ASMARG","T_VA_DCL", +"illegal-symbol", }; static const char *yyrule[] = { "$accept : program", @@ -813,12 +816,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -1001,7 +1004,7 @@ free_parser(void) #endif } #endif -#line 1004 "/dev/stdout" +#line 1006 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -1025,7 +1028,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -1099,9 +1102,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -1183,9 +1184,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -1881,7 +1880,7 @@ case 114: yyval.declarator->func_def = FUNC_ANSI; } break; -#line 1884 "/dev/stdout" +#line 1882 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -1903,9 +1902,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.09.out b/tools/regression/usr.bin/yacc/regress.09.out index 5eaf258..b6c13e2 100644 --- a/tools/regression/usr.bin/yacc/regress.09.out +++ b/tools/regression/usr.bin/yacc/regress.09.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -31,7 +32,7 @@ int YYLEX_DECL(); static void YYERROR_DECL(); #endif -#line 34 "/dev/stdout" +#line 35 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -158,6 +159,7 @@ static const short yycheck[] = { 40, #define YYDEBUG 0 #endif #define YYMAXTOKEN 259 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -168,7 +170,7 @@ static const char *yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,"DIGIT","LETTER","UMINUS", +0,0,0,0,0,0,"DIGIT","LETTER","UMINUS","illegal-symbol", }; static const char *yyrule[] = { "$accept : list", @@ -210,12 +212,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -273,7 +275,7 @@ YYLEX_DECL() } return( c ); } -#line 276 "/dev/stdout" +#line 277 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -297,7 +299,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -371,9 +373,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -455,9 +455,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -539,7 +537,7 @@ case 18: #line 69 "pure_calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } break; -#line 542 "/dev/stdout" +#line 539 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -561,9 +559,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.10.out b/tools/regression/usr.bin/yacc/regress.10.out index 02cba4f..f4a5ba4 100644 --- a/tools/regression/usr.bin/yacc/regress.10.out +++ b/tools/regression/usr.bin/yacc/regress.10.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -26,7 +27,7 @@ int YYLEX_DECL(); static void YYERROR_DECL(); #endif -#line 29 "/dev/stdout" +#line 30 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -93,10 +94,11 @@ static const short yycheck[] = { 256, #define YYDEBUG 0 #endif #define YYMAXTOKEN 0 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { -"end-of-file", +"end-of-file","illegal-symbol", }; static const char *yyrule[] = { "$accept : S", @@ -121,12 +123,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -164,7 +166,7 @@ yyerror(const char* s) { printf("%s\n", s); } -#line 167 "/dev/stdout" +#line 168 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -188,7 +190,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -262,9 +264,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -346,9 +346,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -391,9 +389,7 @@ yyreduce: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.11.out b/tools/regression/usr.bin/yacc/regress.11.out index 1d6561d..8668971 100644 --- a/tools/regression/usr.bin/yacc/regress.11.out +++ b/tools/regression/usr.bin/yacc/regress.11.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -25,7 +26,7 @@ int base; int yylex(void); static void yyerror(const char *s); -#line 28 "/dev/stdout" +#line 29 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -172,6 +173,7 @@ static const short yycheck[] = { 10, #define YYDEBUG 0 #endif #define YYMAXTOKEN 271 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -184,6 +186,7 @@ static const char *yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,"OP_ADD","\"ADD\"","OP_SUB","\"SUB\"","OP_MUL","\"MUL\"","OP_DIV", "\"DIV\"","OP_MOD","\"MOD\"","OP_AND","\"AND\"","DIGIT","LETTER","UMINUS", +"illegal-symbol", }; static const char *yyrule[] = { "$accept : list", @@ -225,12 +228,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -283,7 +286,7 @@ yylex(void) { } return( c ); } -#line 286 "/dev/stdout" +#line 288 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -307,7 +310,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -381,9 +384,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -465,9 +466,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -549,7 +548,7 @@ case 18: #line 70 "quote_calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } break; -#line 552 "/dev/stdout" +#line 550 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -571,9 +570,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.12.out b/tools/regression/usr.bin/yacc/regress.12.out index d3d03b9..757c977 100644 --- a/tools/regression/usr.bin/yacc/regress.12.out +++ b/tools/regression/usr.bin/yacc/regress.12.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -25,7 +26,7 @@ int base; int yylex(void); static void yyerror(const char *s); -#line 28 "/dev/stdout" +#line 29 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -172,6 +173,7 @@ static const short yycheck[] = { 10, #define YYDEBUG 0 #endif #define YYMAXTOKEN 271 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -184,6 +186,7 @@ static const char *yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,"OP_ADD","\"ADD\"","OP_SUB","\"SUB\"","OP_MUL","\"MUL\"","OP_DIV", "\"DIV\"","OP_MOD","\"MOD\"","OP_AND","\"AND\"","DIGIT","LETTER","UMINUS", +"illegal-symbol", }; static const char *yyrule[] = { "$accept : list", @@ -225,12 +228,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -283,7 +286,7 @@ yylex(void) { } return( c ); } -#line 286 "/dev/stdout" +#line 288 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -307,7 +310,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -381,9 +384,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -465,9 +466,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -549,7 +548,7 @@ case 18: #line 70 "quote_calc2.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } break; -#line 552 "/dev/stdout" +#line 550 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -571,9 +570,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.13.out b/tools/regression/usr.bin/yacc/regress.13.out index fc68da8..94b717e 100644 --- a/tools/regression/usr.bin/yacc/regress.13.out +++ b/tools/regression/usr.bin/yacc/regress.13.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -25,7 +26,7 @@ int base; int yylex(void); static void yyerror(const char *s); -#line 28 "/dev/stdout" +#line 29 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -166,6 +167,7 @@ static const short yycheck[] = { 10, #define YYDEBUG 0 #endif #define YYMAXTOKEN 271 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -178,7 +180,7 @@ static const char *yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,"OP_ADD","\"ADD-operator\"","OP_SUB","\"SUB-operator\"","OP_MUL", "\"MUL-operator\"","OP_DIV","\"DIV-operator\"","OP_MOD","\"MOD-operator\"", -"OP_AND","\"AND-operator\"","DIGIT","LETTER","UMINUS", +"OP_AND","\"AND-operator\"","DIGIT","LETTER","UMINUS","illegal-symbol", }; static const char *yyrule[] = { "$accept : list", @@ -220,12 +222,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -278,7 +280,7 @@ yylex(void) { } return( c ); } -#line 281 "/dev/stdout" +#line 282 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -302,7 +304,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -376,9 +378,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -460,9 +460,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -544,7 +542,7 @@ case 18: #line 70 "quote_calc3.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } break; -#line 547 "/dev/stdout" +#line 544 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -566,9 +564,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.14.out b/tools/regression/usr.bin/yacc/regress.14.out index 96fdb57..aecfb49 100644 --- a/tools/regression/usr.bin/yacc/regress.14.out +++ b/tools/regression/usr.bin/yacc/regress.14.out @@ -5,6 +5,7 @@ static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; #define YYBYACC 1 #define YYMAJOR 1 #define YYMINOR 9 +#define YYPATCH 20140101 #define YYEMPTY (-1) #define yyclearin (yychar = YYEMPTY) @@ -25,7 +26,7 @@ int base; int yylex(void); static void yyerror(const char *s); -#line 28 "/dev/stdout" +#line 29 "/dev/stdout" #ifndef YYSTYPE typedef int YYSTYPE; @@ -166,6 +167,7 @@ static const short yycheck[] = { 10, #define YYDEBUG 0 #endif #define YYMAXTOKEN 271 +#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a)) #if YYDEBUG static const char *yyname[] = { @@ -178,7 +180,7 @@ static const char *yyname[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,"OP_ADD","\"ADD-operator\"","OP_SUB","\"SUB-operator\"","OP_MUL", "\"MUL-operator\"","OP_DIV","\"DIV-operator\"","OP_MOD","\"MOD-operator\"", -"OP_AND","\"AND-operator\"","DIGIT","LETTER","UMINUS", +"OP_AND","\"AND-operator\"","DIGIT","LETTER","UMINUS","illegal-symbol", }; static const char *yyrule[] = { "$accept : list", @@ -220,12 +222,12 @@ YYSTYPE yylval; #ifdef YYMAXDEPTH #define YYSTACKSIZE YYMAXDEPTH #else -#define YYSTACKSIZE 500 -#define YYMAXDEPTH 500 +#define YYSTACKSIZE 10000 +#define YYMAXDEPTH 10000 #endif #endif -#define YYINITSTACKSIZE 500 +#define YYINITSTACKSIZE 200 typedef struct { unsigned stacksize; @@ -278,7 +280,7 @@ yylex(void) { } return( c ); } -#line 281 "/dev/stdout" +#line 282 "/dev/stdout" #if YYDEBUG #include <stdio.h> /* needed for printf */ @@ -302,7 +304,7 @@ static int yygrowstack(YYSTACKDATA *data) else if ((newsize *= 2) > YYMAXDEPTH) newsize = YYMAXDEPTH; - i = data->s_mark - data->s_base; + i = (int) (data->s_mark - data->s_base); newss = (short *)realloc(data->s_base, newsize * sizeof(*newss)); if (newss == 0) return -1; @@ -376,9 +378,7 @@ yyloop: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -460,9 +460,7 @@ yyinrecovery: #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, error recovery discards token %d (%s)\n", YYPREFIX, yystate, yychar, yys); } @@ -544,7 +542,7 @@ case 18: #line 70 "quote_calc4.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } break; -#line 547 "/dev/stdout" +#line 544 "/dev/stdout" } yystack.s_mark -= yym; yystate = *yystack.s_mark; @@ -566,9 +564,7 @@ break; #if YYDEBUG if (yydebug) { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; + yys = yyname[YYTRANSLATE(yychar)]; printf("%sdebug: state %d, reading %d (%s)\n", YYPREFIX, YYFINAL, yychar, yys); } diff --git a/tools/regression/usr.bin/yacc/regress.sh b/tools/regression/usr.bin/yacc/regress.sh index 4517084..5b004be 100755 --- a/tools/regression/usr.bin/yacc/regress.sh +++ b/tools/regression/usr.bin/yacc/regress.sh @@ -6,21 +6,21 @@ echo 1..15 REGRESSION_START($1) -REGRESSION_TEST(`00', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout undefined.y') -REGRESSION_TEST(`01', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout calc.y') -REGRESSION_TEST(`02', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout calc1.y') -REGRESSION_TEST(`03', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout calc3.y') -REGRESSION_TEST(`04', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout code_calc.y') -REGRESSION_TEST(`05', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout code_error.y') -REGRESSION_TEST(`06', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout error.y') -REGRESSION_TEST(`07', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout ftp.y') -REGRESSION_TEST(`08', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout grammar.y') -REGRESSION_TEST(`09', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout pure_calc.y') -REGRESSION_TEST(`10', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout pure_error.y') -REGRESSION_TEST(`11', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout quote_calc.y') -REGRESSION_TEST(`12', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout quote_calc2.y') -REGRESSION_TEST(`13', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout quote_calc3.y') -REGRESSION_TEST(`14', `/usr/obj/usr/src/usr.bin/yacc/yacc -b regress -o /dev/stdout quote_calc4.y') +REGRESSION_TEST(`00', `yacc -b regress -o /dev/stdout undefined.y') +REGRESSION_TEST(`01', `yacc -b regress -o /dev/stdout calc.y') +REGRESSION_TEST(`02', `yacc -b regress -o /dev/stdout calc1.y') +REGRESSION_TEST(`03', `yacc -b regress -o /dev/stdout calc3.y') +REGRESSION_TEST(`04', `yacc -b regress -o /dev/stdout code_calc.y') +REGRESSION_TEST(`05', `yacc -b regress -o /dev/stdout code_error.y') +REGRESSION_TEST(`06', `yacc -b regress -o /dev/stdout error.y') +REGRESSION_TEST(`07', `yacc -b regress -o /dev/stdout ftp.y') +REGRESSION_TEST(`08', `yacc -b regress -o /dev/stdout grammar.y') +REGRESSION_TEST(`09', `yacc -b regress -o /dev/stdout pure_calc.y') +REGRESSION_TEST(`10', `yacc -b regress -o /dev/stdout pure_error.y') +REGRESSION_TEST(`11', `yacc -b regress -o /dev/stdout quote_calc.y') +REGRESSION_TEST(`12', `yacc -b regress -o /dev/stdout quote_calc2.y') +REGRESSION_TEST(`13', `yacc -b regress -o /dev/stdout quote_calc3.y') +REGRESSION_TEST(`14', `yacc -b regress -o /dev/stdout quote_calc4.y') REGRESSION_END() diff --git a/tools/regression/usr.sbin/etcupdate/always.sh b/tools/regression/usr.sbin/etcupdate/always.sh index b67fd8b..514481e 100755 --- a/tools/regression/usr.sbin/etcupdate/always.sh +++ b/tools/regression/usr.sbin/etcupdate/always.sh @@ -29,6 +29,7 @@ # Various regression tests to test the -A flag to the 'update' command. +FAILED=no WORKDIR=work usage() @@ -275,6 +276,7 @@ missing() { if [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be missing" + FAILED=yes fi } @@ -283,6 +285,7 @@ present() { if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be present" + FAILED=yes fi } @@ -291,6 +294,7 @@ fifo() { if ! [ -p $TEST/$1 ]; then echo "File $1 should be a FIFO" + FAILED=yes fi } @@ -299,6 +303,7 @@ dir() { if ! [ -d $TEST/$1 ]; then echo "File $1 should be a directory" + FAILED=yes fi } @@ -310,10 +315,12 @@ link() if ! [ -L $TEST/$1 ]; then echo "File $1 should be a link" + FAILED=yes elif [ $# -gt 1 ]; then val=`readlink $TEST/$1` if [ "$val" != "$2" ]; then echo "Link $1 should link to \"$2\"" + FAILED=yes fi fi } @@ -327,15 +334,18 @@ file() if ! [ -f $TEST/$1 ]; then echo "File $1 should be a regular file" + FAILED=yes elif [ $# -eq 2 ]; then contents=`cat $TEST/$1` if [ "$contents" != "$2" ]; then echo "File $1 has wrong contents" + FAILED=yes fi elif [ $# -eq 3 ]; then sum=`md5 -q $TEST/$1` if [ "$sum" != "$3" ]; then echo "File $1 has wrong contents" + FAILED=yes fi fi } @@ -348,10 +358,12 @@ conflict() if ! [ -f $CONFLICTS/$1 ]; then echo "File $1 missing conflict" + FAILED=yes elif [ $# -gt 1 ]; then sum=`md5 -q $CONFLICTS/$1` if [ "$sum" != "$2" ]; then echo "Conflict $1 has wrong contents" + FAILED=yes fi fi } @@ -361,11 +373,13 @@ noconflict() { if [ -f $CONFLICTS/$1 ]; then echo "File $1 should not have a conflict" + FAILED=yes fi } if [ `id -u` -ne 0 ]; then echo "must be root" + exit 0 fi if [ -r /etc/etcupdate.conf ]; then @@ -413,7 +427,8 @@ Warnings: EOF echo "Differences for regular:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \ + || FAILED=yes ## /first/difftype/second: present /first/difftype/second/fifo @@ -533,7 +548,8 @@ Warnings: EOF echo "Differences for -A '/first*' -A '/second* /*di*':" -diff -u -L "correct" $WORKDIR/correct1.out -L "test" $WORKDIR/test1.out +diff -u -L "correct" $WORKDIR/correct1.out -L "test" $WORKDIR/test1.out \ + || FAILED=yes ## /first/difftype/second: present /first/difftype/second/fifo @@ -610,3 +626,5 @@ file /dirchange/todir/difffile/file "baz" ## /dirchange/todir/difftype: file /dirchange/todir/difftype/file "baz" + +[ "${FAILED}" = no ] diff --git a/tools/regression/usr.sbin/etcupdate/conflicts.sh b/tools/regression/usr.sbin/etcupdate/conflicts.sh index ec46927..816c180 100755 --- a/tools/regression/usr.sbin/etcupdate/conflicts.sh +++ b/tools/regression/usr.sbin/etcupdate/conflicts.sh @@ -29,6 +29,7 @@ # Various regression tests to run for the 'resolve' command. +FAILED=no WORKDIR=work usage() @@ -134,6 +135,7 @@ missing() { if [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be missing" + FAILED=yes fi } @@ -142,6 +144,7 @@ present() { if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be present" + FAILED=yes fi } @@ -154,15 +157,18 @@ file() if ! [ -f $TEST/$1 ]; then echo "File $1 should be a regular file" + FAILED=yes elif [ $# -eq 2 ]; then contents=`cat $TEST/$1` if [ "$contents" != "$2" ]; then echo "File $1 has wrong contents" + FAILED=yes fi elif [ $# -eq 3 ]; then sum=`md5 -q $TEST/$1` if [ "$sum" != "$3" ]; then echo "File $1 has wrong contents" + FAILED=yes fi fi } @@ -175,10 +181,12 @@ conflict() if ! [ -f $CONFLICTS/$1 ]; then echo "File $1 missing conflict" + FAILED=yes elif [ $# -gt 1 ]; then sum=`md5 -q $CONFLICTS/$1` if [ "$sum" != "$2" ]; then echo "Conflict $1 has wrong contents" + FAILED=yes fi fi } @@ -188,11 +196,13 @@ resolved() { if [ -f $CONFLICTS/$1 ]; then echo "Conflict $1 should be resolved" + FAILED=yes fi } if [ `id -u` -ne 0 ]; then echo "must be root" + exit 0 fi if [ -r /etc/etcupdate.conf ]; then @@ -255,11 +265,13 @@ echo "Checking newalias warning for 'p'": echo 'p' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias if [ $? -eq 0 ]; then echo "+ Extra warning" + FAILED=yes fi echo "Checking newalias warning for 'mf'": echo 'mf' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias if [ $? -eq 0 ]; then echo "+ Extra warning" + FAILED=yes fi # Verify that 'tf' and 'r' do generate the newaliases warning. @@ -268,6 +280,7 @@ echo "Checking newalias warning for 'tf'": echo 'tf' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias if [ $? -ne 0 ]; then echo "- Missing warning" + FAILED=yes fi build_aliases_conflict @@ -275,4 +288,7 @@ cp $TEST/etc/mail/aliases $CONFLICTS/etc/mail/aliases echo 'r' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias if [ $? -ne 0 ]; then echo "- Missing warning" + FAILED=yes fi + +[ "${FAILED}" = no ] diff --git a/tools/regression/usr.sbin/etcupdate/fbsdid.sh b/tools/regression/usr.sbin/etcupdate/fbsdid.sh index e713c35..c062c06 100755 --- a/tools/regression/usr.sbin/etcupdate/fbsdid.sh +++ b/tools/regression/usr.sbin/etcupdate/fbsdid.sh @@ -29,6 +29,7 @@ # Various regression tests to test the -F flag to the 'update' command. +FAILED=no WORKDIR=work usage() @@ -213,6 +214,7 @@ missing() { if [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be missing" + FAILED=yes fi } @@ -221,6 +223,7 @@ present() { if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be present" + FAILED=yes fi } @@ -233,15 +236,18 @@ file() if ! [ -f $TEST/$1 ]; then echo "File $1 should be a regular file" + FAILED=yes elif [ $# -eq 2 ]; then contents=`cat $TEST/$1` if [ "$contents" != "$2" ]; then echo "File $1 has wrong contents" + FAILED=yes fi elif [ $# -eq 3 ]; then sum=`md5 -q $TEST/$1` if [ "$sum" != "$3" ]; then echo "File $1 has wrong contents" + FAILED=yes fi fi } @@ -254,10 +260,12 @@ conflict() if ! [ -f $CONFLICTS/$1 ]; then echo "File $1 missing conflict" + FAILED=yes elif [ $# -gt 1 ]; then sum=`md5 -q $CONFLICTS/$1` if [ "$sum" != "$2" ]; then echo "Conflict $1 has wrong contents" + FAILED=yes fi fi } @@ -267,11 +275,13 @@ noconflict() { if [ -f $CONFLICTS/$1 ]; then echo "File $1 should not have a conflict" + FAILED=yes fi } if [ `id -u` -ne 0 ]; then echo "must be root" + exit 0 fi if [ -r /etc/etcupdate.conf ]; then @@ -297,7 +307,8 @@ Warnings: EOF echo "Differences for regular:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \ + || FAILED=yes file /remove "" 1bb4776213af107077be78fead8a351c file /old "" 2f799a7addc4132563ef9b44adc66157 @@ -329,7 +340,8 @@ cat > $WORKDIR/correctF.out <<EOF EOF echo "Differences for -F:" -diff -u -L "correct" $WORKDIR/correctF.out -L "test" $WORKDIR/testF.out +diff -u -L "correct" $WORKDIR/correctF.out -L "test" $WORKDIR/testF.out \ + || FAILED=yes missing /remove file /old "" 6a9f34f109d94406a4de3bc5d72de259 @@ -363,7 +375,8 @@ cat > $WORKDIR/correctAF.out <<EOF EOF echo "Differences for -A '/*' -F:" -diff -u -L "correct" $WORKDIR/correctAF.out -L "test" $WORKDIR/testAF.out +diff -u -L "correct" $WORKDIR/correctAF.out -L "test" $WORKDIR/testAF.out \ + || FAILED=yes missing /remove file /old "" 6a9f34f109d94406a4de3bc5d72de259 @@ -377,3 +390,5 @@ noconflict /conflict file /local "" 6a8fc5c2755b7a49015089f5e1dbe092 file /local-already "" 49045f8b51542dd634655301cd296f66 file /local-remove "" 5c38322efed4014797d7127f5c652d9d + +[ "${FAILED}" = no ] diff --git a/tools/regression/usr.sbin/etcupdate/ignore.sh b/tools/regression/usr.sbin/etcupdate/ignore.sh index d6bd2ff..2d3d2f5 100755 --- a/tools/regression/usr.sbin/etcupdate/ignore.sh +++ b/tools/regression/usr.sbin/etcupdate/ignore.sh @@ -29,6 +29,7 @@ # Various regression tests to test the -I flag to the 'update' command. +FAILED=no WORKDIR=work usage() @@ -99,6 +100,7 @@ missing() { if [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be missing" + FAILED=yes fi } @@ -107,6 +109,7 @@ present() { if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be present" + FAILED=yes fi } @@ -115,6 +118,7 @@ dir() { if ! [ -d $TEST/$1 ]; then echo "File $1 should be a directory" + FAILED=yes fi } @@ -127,15 +131,18 @@ file() if ! [ -f $TEST/$1 ]; then echo "File $1 should be a regular file" + FAILED=yes elif [ $# -eq 2 ]; then contents=`cat $TEST/$1` if [ "$contents" != "$2" ]; then echo "File $1 has wrong contents" + FAILED=yes fi elif [ $# -eq 3 ]; then sum=`md5 -q $TEST/$1` if [ "$sum" != "$3" ]; then echo "File $1 has wrong contents" + FAILED=yes fi fi } @@ -148,10 +155,12 @@ conflict() if ! [ -f $CONFLICTS/$1 ]; then echo "File $1 missing conflict" + FAILED=yes elif [ $# -gt 1 ]; then sum=`md5 -q $CONFLICTS/$1` if [ "$sum" != "$2" ]; then echo "Conflict $1 has wrong contents" + FAILED=yes fi fi } @@ -161,11 +170,13 @@ noconflict() { if [ -f $CONFLICTS/$1 ]; then echo "File $1 should not have a conflict" + FAILED=yes fi } if [ `id -u` -ne 0 ]; then echo "must be root" + exit 0 fi if [ -r /etc/etcupdate.conf ]; then @@ -187,7 +198,8 @@ cat > $WORKDIR/correct.out <<EOF EOF echo "Differences for regular:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \ + || FAILED=yes missing /tree/remove file /tree/modify "new" @@ -207,7 +219,8 @@ cat > $WORKDIR/correct1.out <<EOF EOF echo "Differences for -I '/tree/*':" -diff -u -L "correct" $WORKDIR/correct1.out -L "test" $WORKDIR/test1.out +diff -u -L "correct" $WORKDIR/correct1.out -L "test" $WORKDIR/test1.out \ + || FAILED=yes file /tree/remove "old" file /tree/modify "old" @@ -227,7 +240,8 @@ EOF echo "Differences for -I '/tree/*' -I '/rmdir*':" -diff -u -L "correct" $WORKDIR/correct2.out -L "test" $WORKDIR/test2.out +diff -u -L "correct" $WORKDIR/correct2.out -L "test" $WORKDIR/test2.out \ + || FAILED=yes file /tree/remove "old" file /tree/modify "old" @@ -250,10 +264,13 @@ EOF echo "Differences for -I '/tree/* /rmdir/*':" -diff -u -L "correct" $WORKDIR/correct3.out -L "test" $WORKDIR/test3.out +diff -u -L "correct" $WORKDIR/correct3.out -L "test" $WORKDIR/test3.out \ + || FAILED=yes file /tree/remove "old" file /tree/modify "old" missing /tree/add file /rmdir/file "foo" dir /rmdir + +[ "${FAILED}" = no ] diff --git a/tools/regression/usr.sbin/etcupdate/preworld.sh b/tools/regression/usr.sbin/etcupdate/preworld.sh index ccd7b75..c731293 100755 --- a/tools/regression/usr.sbin/etcupdate/preworld.sh +++ b/tools/regression/usr.sbin/etcupdate/preworld.sh @@ -29,6 +29,7 @@ # Regression tests for the pre-world (-p) mode +FAILED=no WORKDIR=work usage() @@ -147,6 +148,7 @@ missing() { if [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be missing" + FAILED=yes fi } @@ -155,6 +157,7 @@ present() { if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be present" + FAILED=yes fi } @@ -167,15 +170,18 @@ file() if ! [ -f $TEST/$1 ]; then echo "File $1 should be a regular file" + FAILED=yes elif [ $# -eq 2 ]; then contents=`cat $TEST/$1` if [ "$contents" != "$2" ]; then echo "File $1 has wrong contents" + FAILED=yes fi elif [ $# -eq 3 ]; then sum=`md5 -q $TEST/$1` if [ "$sum" != "$3" ]; then echo "File $1 has wrong contents" + FAILED=yes fi fi } @@ -188,10 +194,12 @@ conflict() if ! [ -f $CONFLICTS/$1 ]; then echo "File $1 missing conflict" + FAILED=yes elif [ $# -gt 1 ]; then sum=`md5 -q $CONFLICTS/$1` if [ "$sum" != "$2" ]; then echo "Conflict $1 has wrong contents" + FAILED=yes fi fi } @@ -213,6 +221,7 @@ check_trees() if [ `id -u` -ne 0 ]; then echo "must be root" + exit 0 fi if [ -r /etc/etcupdate.conf ]; then @@ -229,11 +238,15 @@ cat > $WORKDIR/correct.out <<EOF EOF echo "Differences for -n:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out \ + || FAILED=yes $COMMAND -p -s $SRC -d $WORKDIR -D $TEST > $WORKDIR/test.out echo "Differences for real:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \ + || FAILED=yes check_trees + +[ "${FAILED}" = no ] diff --git a/tools/regression/usr.sbin/etcupdate/tests.sh b/tools/regression/usr.sbin/etcupdate/tests.sh index 22b3d0b..b99bbef 100755 --- a/tools/regression/usr.sbin/etcupdate/tests.sh +++ b/tools/regression/usr.sbin/etcupdate/tests.sh @@ -29,6 +29,7 @@ # Various regression tests to run for the 'update' command. +FAILED=no WORKDIR=work usage() @@ -653,6 +654,7 @@ missing() { if [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be missing" + FAILED=yes fi } @@ -661,6 +663,7 @@ present() { if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be present" + FAILED=yes fi } @@ -669,6 +672,7 @@ fifo() { if ! [ -p $TEST/$1 ]; then echo "File $1 should be a FIFO" + FAILED=yes fi } @@ -677,6 +681,7 @@ dir() { if ! [ -d $TEST/$1 ]; then echo "File $1 should be a directory" + FAILED=yes fi } @@ -688,10 +693,12 @@ link() if ! [ -L $TEST/$1 ]; then echo "File $1 should be a link" + FAILED=yes elif [ $# -gt 1 ]; then val=`readlink $TEST/$1` if [ "$val" != "$2" ]; then echo "Link $1 should link to \"$2\"" + FAILED=yes fi fi } @@ -705,15 +712,18 @@ file() if ! [ -f $TEST/$1 ]; then echo "File $1 should be a regular file" + FAILED=yes elif [ $# -eq 2 ]; then contents=`cat $TEST/$1` if [ "$contents" != "$2" ]; then echo "File $1 has wrong contents" + FAILED=yes fi elif [ $# -eq 3 ]; then sum=`md5 -q $TEST/$1` if [ "$sum" != "$3" ]; then echo "File $1 has wrong contents" + FAILED=yes fi fi } @@ -726,10 +736,12 @@ conflict() if ! [ -f $CONFLICTS/$1 ]; then echo "File $1 missing conflict" + FAILED=yes elif [ $# -gt 1 ]; then sum=`md5 -q $CONFLICTS/$1` if [ "$sum" != "$2" ]; then echo "Conflict $1 has wrong contents" + FAILED=yes fi fi } @@ -920,6 +932,7 @@ check_trees() if [ `id -u` -ne 0 ]; then echo "must be root" + exit 0 fi if [ -r /etc/etcupdate.conf ]; then @@ -994,11 +1007,15 @@ Warnings: EOF echo "Differences for -n:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out \ + || failed=YES $COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out echo "Differences for real:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \ + || failed=YES check_trees + +[ "${FAILED}" = no ] diff --git a/tools/regression/usr.sbin/etcupdate/tzsetup.sh b/tools/regression/usr.sbin/etcupdate/tzsetup.sh index 20107f4..b102938 100755 --- a/tools/regression/usr.sbin/etcupdate/tzsetup.sh +++ b/tools/regression/usr.sbin/etcupdate/tzsetup.sh @@ -29,6 +29,7 @@ # Various regression tests for the tzsetup handling in the 'update' command. +FAILED=no WORKDIR=work usage() @@ -85,6 +86,7 @@ missing() { if [ -e $TEST/$1 -o -L $TEST/$1 ]; then echo "File $1 should be missing" + FAILED=yes fi } @@ -96,10 +98,12 @@ link() if ! [ -L $TEST/$1 ]; then echo "File $1 should be a link" + FAILED=yes elif [ $# -gt 1 ]; then val=`readlink $TEST/$1` if [ "$val" != "$2" ]; then echo "Link $1 should link to \"$2\"" + FAILED=yes fi fi } @@ -113,21 +117,25 @@ file() if ! [ -f $TEST/$1 ]; then echo "File $1 should be a regular file" + FAILED=yes elif [ $# -eq 2 ]; then contents=`cat $TEST/$1` if [ "$contents" != "$2" ]; then echo "File $1 has wrong contents" + FAILED=yes fi elif [ $# -eq 3 ]; then sum=`md5 -q $TEST/$1` if [ "$sum" != "$3" ]; then echo "File $1 has wrong contents" + FAILED=yes fi fi } if [ `id -u` -ne 0 ]; then echo "must be root" + exit 0 fi if [ -r /etc/etcupdate.conf ]; then @@ -144,12 +152,14 @@ cat > $WORKDIR/correct.out <<EOF EOF echo "Differences for no /etc/localtime with -n:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out \ + || FAILED=yes $COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out echo "Differences for no /etc/localtime:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \ + || FAILED=yes missing /etc/localtime missing /var/db/zoneinfo @@ -165,12 +175,14 @@ cat > $WORKDIR/correct.out <<EOF EOF echo "Differences for symlinked /etc/localtime with -n:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out \ + || FAILED=yes $COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out echo "Differences for symlinked /etc/localtime:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \ + || FAILED=yes link /etc/localtime "/dev/null" missing /var/db/zoneinfo @@ -188,12 +200,14 @@ Warnings: EOF echo "Differences for missing /var/db/zoneinfo with -n:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out \ + || FAILED=yes $COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out echo "Differences for missing /var/db/zoneinfo:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \ + || FAILED=yes file /etc/localtime "bar" missing /var/db/zoneinfo @@ -210,12 +224,16 @@ cat > $WORKDIR/correct.out <<EOF EOF echo "Differences for real update with -n:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out \ + || FAILED=yes $COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out echo "Differences for real update:" -diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out +diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out \ + || FAILED=yes file /etc/localtime "foo" file /var/db/zoneinfo "foo" + +[ "${FAILED}" = no ] diff --git a/tools/regression/usr.sbin/sa/regress.t b/tools/regression/usr.sbin/sa/regress.t index 2f64cf9..d28536a 100755 --- a/tools/regression/usr.sbin/sa/regress.t +++ b/tools/regression/usr.sbin/sa/regress.t @@ -7,10 +7,16 @@ DIR=`dirname $0` LCDIR=`dirname $0`/../../usr.bin/lastcomm ARCH=`uname -m` +collapse_whitespace() +{ + sed -E 's,[ ]+, ,g' +} + check() { NUM=$1 shift + collapse_whitespace | \ if diff -q - $1 then echo "ok $NUM" @@ -64,7 +70,8 @@ sa -m -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in /dev/null | cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in sa -is -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in >/dev/null cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in -sa -s -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in >$DIR/double +sa -s -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in \ + | collapse_whitespace >$DIR/double cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in sa -i $DIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in | check 13 $DIR/double diff --git a/tools/regression/usr.sbin/sa/v1-amd64-sav.out b/tools/regression/usr.sbin/sa/v1-amd64-sav.out index 5b3d184..a2289ee 100644 --- a/tools/regression/usr.sbin/sa/v1-amd64-sav.out +++ b/tools/regression/usr.sbin/sa/v1-amd64-sav.out @@ -1,5 +1,5 @@ - 28 0.282re 0.06cp 40avio 957k - 13 0.141re 0.06cp 87avio 903k ***other - 3 0.000re 0.00cp 0avio 0k ln - 9 0.141re 0.00cp 0avio 19700k time - 3 0.000re 0.00cp 0avio 0k time* + 28 0.282re 0.06cp 40avio 957k + 13 0.141re 0.06cp 87avio 903k ***other + 3 0.000re 0.00cp 0avio 0k ln + 9 0.141re 0.00cp 0avio 19700k time + 3 0.000re 0.00cp 0avio 0k time* diff --git a/tools/regression/usr.sbin/sa/v1-amd64-u.out b/tools/regression/usr.sbin/sa/v1-amd64-u.out index 8541425..4c13b76 100644 --- a/tools/regression/usr.sbin/sa/v1-amd64-u.out +++ b/tools/regression/usr.sbin/sa/v1-amd64-u.out @@ -1,28 +1,28 @@ - 0 0.000 cpu 0k mem 0 io accton - 0 0.172 cpu 41k mem 0 io awk - 0 0.000 cpu 140k mem 0 io time - 0 3.031 cpu 45k mem 1 io egrep - 0 0.000 cpu 0k mem 0 io time - 0 0.250 cpu 42k mem 1087 io find - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io sleep - 0 0.000 cpu 57k mem 0 io time - 0 0.016 cpu 31k mem 16 io dd - 0 0.000 cpu 0k mem 0 io time - 0 0.203 cpu 1976k mem 0 io diff - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io time* - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io time* - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io time* - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 713k mem 0 io cc1 - 0 0.000 cpu 0k mem 0 io as - 0 0.000 cpu 228k mem 1 io ld - 0 0.000 cpu 196k mem 9 io cc - 0 0.000 cpu 45k mem 7 io core - 0 0.000 cpu 0k mem 9 io core* + 0 0.000 cpu 0k mem 0 io accton + 0 0.172 cpu 41k mem 0 io awk + 0 0.000 cpu 140k mem 0 io time + 0 3.031 cpu 45k mem 1 io egrep + 0 0.000 cpu 0k mem 0 io time + 0 0.250 cpu 42k mem 1087 io find + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io sleep + 0 0.000 cpu 57k mem 0 io time + 0 0.016 cpu 31k mem 16 io dd + 0 0.000 cpu 0k mem 0 io time + 0 0.203 cpu 1976k mem 0 io diff + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io time* + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io time* + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io time* + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 713k mem 0 io cc1 + 0 0.000 cpu 0k mem 0 io as + 0 0.000 cpu 228k mem 1 io ld + 0 0.000 cpu 196k mem 9 io cc + 0 0.000 cpu 45k mem 7 io core + 0 0.000 cpu 0k mem 9 io core* diff --git a/tools/regression/usr.sbin/sa/v1-amd64-usr.out b/tools/regression/usr.sbin/sa/v1-amd64-usr.out index b3a0a8a..2282808 100644 --- a/tools/regression/usr.sbin/sa/v1-amd64-usr.out +++ b/tools/regression/usr.sbin/sa/v1-amd64-usr.out @@ -1 +1 @@ -root 28 0.06cpu 1130tio 3514k*sec +root 28 0.06cpu 1130tio 3514k*sec diff --git a/tools/regression/usr.sbin/sa/v1-i386-sav.out b/tools/regression/usr.sbin/sa/v1-i386-sav.out index 8b29949..a8d68b1 100644 --- a/tools/regression/usr.sbin/sa/v1-i386-sav.out +++ b/tools/regression/usr.sbin/sa/v1-i386-sav.out @@ -1,5 +1,5 @@ - 28 0.425re 0.10cp 143avio 477k - 14 0.220re 0.10cp 286avio 411k ***other - 2 0.000re 0.00cp 0avio 0k 1234567890123456 - 3 0.000re 0.00cp 0avio 0k ln - 9 0.205re 0.00cp 0avio 40400k time + 28 0.425re 0.10cp 143avio 477k + 14 0.220re 0.10cp 286avio 411k ***other + 2 0.000re 0.00cp 0avio 0k 1234567890123456 + 3 0.000re 0.00cp 0avio 0k ln + 9 0.205re 0.00cp 0avio 40400k time diff --git a/tools/regression/usr.sbin/sa/v1-i386-u.out b/tools/regression/usr.sbin/sa/v1-i386-u.out index 75223bc..17c28be 100644 --- a/tools/regression/usr.sbin/sa/v1-i386-u.out +++ b/tools/regression/usr.sbin/sa/v1-i386-u.out @@ -1,28 +1,28 @@ - 0 0.000 cpu 264k mem 0 io accton - 0 0.453 cpu 41k mem 0 io awk - 0 0.000 cpu 0k mem 0 io time - 0 4.984 cpu 41k mem 28 io egrep - 0 0.000 cpu 140k mem 0 io time - 0 0.266 cpu 36k mem 3921 io find - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io sleep - 0 0.000 cpu 0k mem 0 io time - 0 0.016 cpu 25k mem 16 io dd - 0 0.000 cpu 0k mem 0 io time - 0 0.312 cpu 1361k mem 0 io diff - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io 123456789012345 - 0 0.000 cpu 0k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io 1234567890123456 - 0 0.000 cpu 264k mem 0 io time - 0 0.000 cpu 0k mem 0 io ln - 0 0.000 cpu 0k mem 0 io 1234567890123456 - 0 0.000 cpu 0k mem 0 io time - 0 0.016 cpu 233k mem 1 io cc1 - 0 0.000 cpu 482k mem 1 io as - 0 0.000 cpu 0k mem 11 io ld - 0 0.000 cpu 0k mem 6 io cc - 0 0.000 cpu 0k mem 12 io core - 0 0.000 cpu 0k mem 7 io core* + 0 0.000 cpu 264k mem 0 io accton + 0 0.453 cpu 41k mem 0 io awk + 0 0.000 cpu 0k mem 0 io time + 0 4.984 cpu 41k mem 28 io egrep + 0 0.000 cpu 140k mem 0 io time + 0 0.266 cpu 36k mem 3921 io find + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io sleep + 0 0.000 cpu 0k mem 0 io time + 0 0.016 cpu 25k mem 16 io dd + 0 0.000 cpu 0k mem 0 io time + 0 0.312 cpu 1361k mem 0 io diff + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io 123456789012345 + 0 0.000 cpu 0k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io 1234567890123456 + 0 0.000 cpu 264k mem 0 io time + 0 0.000 cpu 0k mem 0 io ln + 0 0.000 cpu 0k mem 0 io 1234567890123456 + 0 0.000 cpu 0k mem 0 io time + 0 0.016 cpu 233k mem 1 io cc1 + 0 0.000 cpu 482k mem 1 io as + 0 0.000 cpu 0k mem 11 io ld + 0 0.000 cpu 0k mem 6 io cc + 0 0.000 cpu 0k mem 12 io core + 0 0.000 cpu 0k mem 7 io core* diff --git a/tools/regression/usr.sbin/sa/v1-i386-usr.out b/tools/regression/usr.sbin/sa/v1-i386-usr.out index ddbd370..cf9e7bd 100644 --- a/tools/regression/usr.sbin/sa/v1-i386-usr.out +++ b/tools/regression/usr.sbin/sa/v1-i386-usr.out @@ -1 +1 @@ -root 28 0.10cpu 4003tio 2887k*sec +root 28 0.10cpu 4003tio 2887k*sec diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-sav.out b/tools/regression/usr.sbin/sa/v1-sparc64-sav.out index 9d04ff8..1905420 100644 --- a/tools/regression/usr.sbin/sa/v1-sparc64-sav.out +++ b/tools/regression/usr.sbin/sa/v1-sparc64-sav.out @@ -1,5 +1,5 @@ - 28 1.839re 0.66cp 161avio 252k
- 14 0.930re 0.66cp 322avio 197k ***other
- 9 0.908re 0.00cp 0avio 10190k time
- 3 0.001re 0.00cp 0avio 16256k ln
- 2 0.001re 0.00cp 0avio 27900k 1234567890123456
+ 28 1.839re 0.66cp 161avio 252k
+ 14 0.930re 0.66cp 322avio 197k ***other
+ 9 0.908re 0.00cp 0avio 10190k time
+ 3 0.001re 0.00cp 0avio 16256k ln
+ 2 0.001re 0.00cp 0avio 27900k 1234567890123456
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-u.out b/tools/regression/usr.sbin/sa/v1-sparc64-u.out index 78dd4db..d0ecb51 100644 --- a/tools/regression/usr.sbin/sa/v1-sparc64-u.out +++ b/tools/regression/usr.sbin/sa/v1-sparc64-u.out @@ -1,28 +1,28 @@ - 0 0.016 cpu 162k mem 0 io accton
- 0 1.609 cpu 273k mem 0 io awk
- 0 0.016 cpu 174k mem 0 io time
- 0 29.750 cpu 233k mem 26 io egrep
- 0 0.016 cpu 161k mem 0 io time
- 0 5.516 cpu 184k mem 4437 io find
- 0 0.016 cpu 156k mem 0 io time
- 0 0.000 cpu 136k mem 0 io sleep
- 0 0.016 cpu 152k mem 0 io time
- 0 0.562 cpu 161k mem 16 io dd
- 0 0.016 cpu 156k mem 0 io time
- 0 1.641 cpu 193k mem 0 io diff
- 0 0.016 cpu 156k mem 0 io time
- 0 0.000 cpu 169k mem 0 io ln
- 0 0.000 cpu 144k mem 0 io 123456789012345
- 0 0.016 cpu 166k mem 0 io time
- 0 0.016 cpu 170k mem 0 io ln
- 0 0.000 cpu 144k mem 0 io 1234567890123456
- 0 0.016 cpu 156k mem 0 io time
- 0 0.016 cpu 169k mem 0 io ln
- 0 0.000 cpu 135k mem 0 io 1234567890123456
- 0 0.016 cpu 156k mem 0 io time
- 0 0.094 cpu 3462k mem 2 io cc1
- 0 0.016 cpu 1047k mem 1 io as
- 0 0.094 cpu 1118k mem 10 io ld
- 0 0.016 cpu 361k mem 5 io cc
- 0 0.031 cpu 165k mem 7 io core
- 0 0.000 cpu 112k mem 4 io core*
+ 0 0.016 cpu 162k mem 0 io accton
+ 0 1.609 cpu 273k mem 0 io awk
+ 0 0.016 cpu 174k mem 0 io time
+ 0 29.750 cpu 233k mem 26 io egrep
+ 0 0.016 cpu 161k mem 0 io time
+ 0 5.516 cpu 184k mem 4437 io find
+ 0 0.016 cpu 156k mem 0 io time
+ 0 0.000 cpu 136k mem 0 io sleep
+ 0 0.016 cpu 152k mem 0 io time
+ 0 0.562 cpu 161k mem 16 io dd
+ 0 0.016 cpu 156k mem 0 io time
+ 0 1.641 cpu 193k mem 0 io diff
+ 0 0.016 cpu 156k mem 0 io time
+ 0 0.000 cpu 169k mem 0 io ln
+ 0 0.000 cpu 144k mem 0 io 123456789012345
+ 0 0.016 cpu 166k mem 0 io time
+ 0 0.016 cpu 170k mem 0 io ln
+ 0 0.000 cpu 144k mem 0 io 1234567890123456
+ 0 0.016 cpu 156k mem 0 io time
+ 0 0.016 cpu 169k mem 0 io ln
+ 0 0.000 cpu 135k mem 0 io 1234567890123456
+ 0 0.016 cpu 156k mem 0 io time
+ 0 0.094 cpu 3462k mem 2 io cc1
+ 0 0.016 cpu 1047k mem 1 io as
+ 0 0.094 cpu 1118k mem 10 io ld
+ 0 0.016 cpu 361k mem 5 io cc
+ 0 0.031 cpu 165k mem 7 io core
+ 0 0.000 cpu 112k mem 4 io core*
diff --git a/tools/regression/usr.sbin/sa/v1-sparc64-usr.out b/tools/regression/usr.sbin/sa/v1-sparc64-usr.out index fc777a3..cab001f 100644 --- a/tools/regression/usr.sbin/sa/v1-sparc64-usr.out +++ b/tools/regression/usr.sbin/sa/v1-sparc64-usr.out @@ -1 +1 @@ -root 28 0.66cpu 4508tio 9971k*sec
+root 28 0.66cpu 4508tio 9971k*sec
diff --git a/tools/regression/usr.sbin/sa/v2-amd64-u.out b/tools/regression/usr.sbin/sa/v2-amd64-u.out index a118170..4196f4a 100644 --- a/tools/regression/usr.sbin/sa/v2-amd64-u.out +++ b/tools/regression/usr.sbin/sa/v2-amd64-u.out @@ -1,28 +1,28 @@ - 0 0.002 cpu 68k mem 0 io accton - 0 0.163 cpu 35k mem 0 io awk - 0 0.003 cpu 0k mem 0 io time - 0 3.247 cpu 29k mem 26 io egrep - 0 0.003 cpu 93k mem 0 io time - 0 0.822 cpu 19k mem 4472 io find - 0 0.003 cpu 0k mem 0 io time - 0 0.002 cpu 0k mem 0 io sleep - 0 0.004 cpu 88k mem 0 io time - 0 0.076 cpu 18k mem 16 io dd - 0 0.003 cpu 0k mem 0 io time - 0 0.223 cpu 24k mem 0 io diff - 0 0.003 cpu 0k mem 0 io time - 0 0.003 cpu 0k mem 0 io ln - 0 0.002 cpu 0k mem 0 io 123456789012345 - 0 0.003 cpu 0k mem 0 io time - 0 0.002 cpu 0k mem 0 io ln - 0 0.002 cpu 0k mem 0 io 1234567890123456 - 0 0.003 cpu 0k mem 0 io time - 0 0.002 cpu 0k mem 0 io ln - 0 0.002 cpu 70k mem 0 io 1234567890123456 - 0 0.003 cpu 0k mem 0 io time - 0 0.024 cpu 661k mem 2 io cc1 - 0 0.005 cpu 0k mem 1 io as - 0 0.014 cpu 192k mem 9 io ld - 0 0.005 cpu 162k mem 5 io cc - 0 0.005 cpu 0k mem 13 io core - 0 0.002 cpu 0k mem 7 io core* + 0 0.002 cpu 68k mem 0 io accton + 0 0.163 cpu 35k mem 0 io awk + 0 0.003 cpu 0k mem 0 io time + 0 3.247 cpu 29k mem 26 io egrep + 0 0.003 cpu 93k mem 0 io time + 0 0.822 cpu 19k mem 4472 io find + 0 0.003 cpu 0k mem 0 io time + 0 0.002 cpu 0k mem 0 io sleep + 0 0.004 cpu 88k mem 0 io time + 0 0.076 cpu 18k mem 16 io dd + 0 0.003 cpu 0k mem 0 io time + 0 0.223 cpu 24k mem 0 io diff + 0 0.003 cpu 0k mem 0 io time + 0 0.003 cpu 0k mem 0 io ln + 0 0.002 cpu 0k mem 0 io 123456789012345 + 0 0.003 cpu 0k mem 0 io time + 0 0.002 cpu 0k mem 0 io ln + 0 0.002 cpu 0k mem 0 io 1234567890123456 + 0 0.003 cpu 0k mem 0 io time + 0 0.002 cpu 0k mem 0 io ln + 0 0.002 cpu 70k mem 0 io 1234567890123456 + 0 0.003 cpu 0k mem 0 io time + 0 0.024 cpu 661k mem 2 io cc1 + 0 0.005 cpu 0k mem 1 io as + 0 0.014 cpu 192k mem 9 io ld + 0 0.005 cpu 162k mem 5 io cc + 0 0.005 cpu 0k mem 13 io core + 0 0.002 cpu 0k mem 7 io core* diff --git a/tools/regression/usr.sbin/sa/v2-i386-u.out b/tools/regression/usr.sbin/sa/v2-i386-u.out index 454a228..b553eb8 100644 --- a/tools/regression/usr.sbin/sa/v2-i386-u.out +++ b/tools/regression/usr.sbin/sa/v2-i386-u.out @@ -1,28 +1,28 @@ - 0 0.001 cpu 0k mem 0 io accton - 0 0.448 cpu 112k mem 0 io awk - 0 0.001 cpu 0k mem 0 io time - 0 6.680 cpu 110k mem 0 io egrep - 0 0.001 cpu 0k mem 0 io time - 0 0.248 cpu 108k mem 0 io find - 0 0.001 cpu 0k mem 0 io time - 0 0.001 cpu 0k mem 0 io sleep - 0 0.001 cpu 0k mem 0 io time - 0 0.025 cpu 103k mem 16 io dd - 0 0.001 cpu 0k mem 0 io time - 0 0.423 cpu 110k mem 0 io diff - 0 0.001 cpu 0k mem 0 io time - 0 0.001 cpu 0k mem 0 io ln - 0 0.001 cpu 0k mem 0 io 123456789012345 - 0 0.001 cpu 0k mem 0 io time - 0 0.001 cpu 0k mem 0 io ln - 0 0.001 cpu 0k mem 0 io 1234567890123456 - 0 0.001 cpu 140k mem 0 io time - 0 0.001 cpu 0k mem 0 io ln - 0 0.001 cpu 0k mem 0 io 1234567890123456 - 0 0.001 cpu 0k mem 0 io time - 0 0.016 cpu 620k mem 0 io cc1 - 0 0.002 cpu 432k mem 0 io as - 0 0.028 cpu 96k mem 0 io ld - 0 0.002 cpu 0k mem 0 io cc - 0 0.002 cpu 68k mem 12 io core - 0 0.000 cpu 0k mem 7 io core* + 0 0.001 cpu 0k mem 0 io accton + 0 0.448 cpu 112k mem 0 io awk + 0 0.001 cpu 0k mem 0 io time + 0 6.680 cpu 110k mem 0 io egrep + 0 0.001 cpu 0k mem 0 io time + 0 0.248 cpu 108k mem 0 io find + 0 0.001 cpu 0k mem 0 io time + 0 0.001 cpu 0k mem 0 io sleep + 0 0.001 cpu 0k mem 0 io time + 0 0.025 cpu 103k mem 16 io dd + 0 0.001 cpu 0k mem 0 io time + 0 0.423 cpu 110k mem 0 io diff + 0 0.001 cpu 0k mem 0 io time + 0 0.001 cpu 0k mem 0 io ln + 0 0.001 cpu 0k mem 0 io 123456789012345 + 0 0.001 cpu 0k mem 0 io time + 0 0.001 cpu 0k mem 0 io ln + 0 0.001 cpu 0k mem 0 io 1234567890123456 + 0 0.001 cpu 140k mem 0 io time + 0 0.001 cpu 0k mem 0 io ln + 0 0.001 cpu 0k mem 0 io 1234567890123456 + 0 0.001 cpu 0k mem 0 io time + 0 0.016 cpu 620k mem 0 io cc1 + 0 0.002 cpu 432k mem 0 io as + 0 0.028 cpu 96k mem 0 io ld + 0 0.002 cpu 0k mem 0 io cc + 0 0.002 cpu 68k mem 12 io core + 0 0.000 cpu 0k mem 7 io core* diff --git a/tools/regression/usr.sbin/sa/v2-sparc64-u.out b/tools/regression/usr.sbin/sa/v2-sparc64-u.out index c02ec9c..9339238 100644 --- a/tools/regression/usr.sbin/sa/v2-sparc64-u.out +++ b/tools/regression/usr.sbin/sa/v2-sparc64-u.out @@ -1,36 +1,36 @@ - 0 0.019 cpu 163k mem 0 io accton
- 0 1.644 cpu 272k mem 0 io awk
- 0 0.029 cpu 175k mem 0 io time
- 0 0.019 cpu 163k mem 0 io sleep
- 0 0.032 cpu 214k mem 35 io fsck_ufs
- 0 0.028 cpu 213k mem 10 io fsck_ufs
- 0 0.028 cpu 189k mem 8 io fsck_ufs
- 0 0.028 cpu 196k mem 7 io fsck_ufs
- 0 0.055 cpu 168k mem 0 io fsck
- 0 0.008 cpu 204k mem 0 io sh*
- 0 0.023 cpu 179k mem 0 io logger
- 0 26.715 cpu 233k mem 25 io egrep
- 0 0.029 cpu 162k mem 0 io time
- 0 5.703 cpu 184k mem 4444 io find
- 0 0.029 cpu 166k mem 0 io time
- 0 0.018 cpu 136k mem 0 io sleep
- 0 0.028 cpu 157k mem 0 io time
- 0 0.588 cpu 160k mem 16 io dd
- 0 0.027 cpu 162k mem 0 io time
- 0 1.636 cpu 193k mem 0 io diff
- 0 0.029 cpu 172k mem 0 io time
- 0 0.020 cpu 170k mem 0 io ln
- 0 0.018 cpu 135k mem 0 io 123456789012345
- 0 0.029 cpu 167k mem 0 io time
- 0 0.019 cpu 163k mem 0 io ln
- 0 0.017 cpu 135k mem 0 io 1234567890123456
- 0 0.029 cpu 157k mem 0 io time
- 0 0.019 cpu 163k mem 0 io ln
- 0 0.017 cpu 135k mem 0 io 1234567890123456
- 0 0.029 cpu 162k mem 0 io time
- 0 0.105 cpu 3358k mem 2 io cc1
- 0 0.030 cpu 996k mem 1 io as
- 0 0.186 cpu 1114k mem 11 io ld
- 0 0.033 cpu 386k mem 6 io cc
- 0 0.037 cpu 158k mem 12 io core
- 0 0.010 cpu 129k mem 7 io core*
+ 0 0.019 cpu 163k mem 0 io accton
+ 0 1.644 cpu 272k mem 0 io awk
+ 0 0.029 cpu 175k mem 0 io time
+ 0 0.019 cpu 163k mem 0 io sleep
+ 0 0.032 cpu 214k mem 35 io fsck_ufs
+ 0 0.028 cpu 213k mem 10 io fsck_ufs
+ 0 0.028 cpu 189k mem 8 io fsck_ufs
+ 0 0.028 cpu 196k mem 7 io fsck_ufs
+ 0 0.055 cpu 168k mem 0 io fsck
+ 0 0.008 cpu 204k mem 0 io sh*
+ 0 0.023 cpu 179k mem 0 io logger
+ 0 26.715 cpu 233k mem 25 io egrep
+ 0 0.029 cpu 162k mem 0 io time
+ 0 5.703 cpu 184k mem 4444 io find
+ 0 0.029 cpu 166k mem 0 io time
+ 0 0.018 cpu 136k mem 0 io sleep
+ 0 0.028 cpu 157k mem 0 io time
+ 0 0.588 cpu 160k mem 16 io dd
+ 0 0.027 cpu 162k mem 0 io time
+ 0 1.636 cpu 193k mem 0 io diff
+ 0 0.029 cpu 172k mem 0 io time
+ 0 0.020 cpu 170k mem 0 io ln
+ 0 0.018 cpu 135k mem 0 io 123456789012345
+ 0 0.029 cpu 167k mem 0 io time
+ 0 0.019 cpu 163k mem 0 io ln
+ 0 0.017 cpu 135k mem 0 io 1234567890123456
+ 0 0.029 cpu 157k mem 0 io time
+ 0 0.019 cpu 163k mem 0 io ln
+ 0 0.017 cpu 135k mem 0 io 1234567890123456
+ 0 0.029 cpu 162k mem 0 io time
+ 0 0.105 cpu 3358k mem 2 io cc1
+ 0 0.030 cpu 996k mem 1 io as
+ 0 0.186 cpu 1114k mem 11 io ld
+ 0 0.033 cpu 386k mem 6 io cc
+ 0 0.037 cpu 158k mem 12 io core
+ 0 0.010 cpu 129k mem 7 io core*
|
