MFC various moves of tools/regressions/ tests to the new infrastructure.

- r263220 Migrate tools/regression/sbin/ to the new tests layout.
- r263222 Add Makefile missed in r263220.
- r263226 Migrate tools/regression/{usr.bin/lastcomm,usr.sbin}/ to the new tests layout.
- r263227 Migrate most of tools/regression/usr.bin/ to the new tests layout.
- r263345 Expand tabs that sneaked in into spaces.
- r263346 Migrate tools/regression/usr.bin/make/ to the new tests layout.
- r263348 Add Makefiles missed in r263346.
- r263351 Migrate tools/regression/usr.bin/pkill/ to the new tests layout.
- r263388 Mark multi_test as requiring /usr/share/dict/words.
- r263814 Fix path to the run.pl script to let these tests run.
- r264742 Prevent building tests when bootstrapping make.

This is 'make tinderbox' clean.

4 files changed, 413 insertions, 0 deletions

diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 74d1c4d..57c9211 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -31,6 +31,8 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+.include <bsd.own.mk>
+
 SRCS=	dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \
 	tree.c conflex.c errwarn.c inet.c packet.c convert.c tables.c \
 	parse.c privsep.c
@@ -44,4 +46,8 @@ LDADD=	-lutil
 
 WARNS?=	2
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile
new file mode 100644
index 0000000..b092eea
--- /dev/null
+++ b/sbin/dhclient/tests/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sbin/dhclient
+
+.PATH:	${.CURDIR}/..
+
+PLAIN_TESTS_C=				option-domain-search_test
+SRCS.option-domain-search_test=		alloc.c convert.c hash.c options.c \
+					tables.c fake.c option-domain-search.c
+CFLAGS.option-domain-search_test+=	-I${.CURDIR}/..
+LDADD.option-domain-search_test=	-lutil
+
+WARNS?=	2
+
+.include <bsd.test.mk>
diff --git a/sbin/dhclient/tests/fake.c b/sbin/dhclient/tests/fake.c
new file mode 100644
index 0000000..c204d49
--- /dev/null
+++ b/sbin/dhclient/tests/fake.c
@@ -0,0 +1,64 @@
+/* $FreeBSD$ */
+
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "dhcpd.h"
+
+extern jmp_buf env;
+
+void
+error(char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+
+	longjmp(env, 1);
+}
+
+int
+warning(char *fmt, ...)
+{
+	int ret;
+	va_list ap;
+
+	va_start(ap, fmt);
+	ret = vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+
+	/*
+	 * The original warning() would return "ret" here. We do this to
+	 * check warnings explicitely.
+	 */
+	longjmp(env, 1);
+}
+
+int
+note(char *fmt, ...)
+{
+	int ret;
+	va_list ap;
+
+	va_start(ap, fmt);
+	ret = vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+
+	return ret;
+}
+
+void
+bootp(struct packet *packet)
+{
+}
+
+void
+dhcp(struct packet *packet)
+{
+}
diff --git a/sbin/dhclient/tests/option-domain-search.c b/sbin/dhclient/tests/option-domain-search.c
new file mode 100644
index 0000000..b79f9a5
--- /dev/null
+++ b/sbin/dhclient/tests/option-domain-search.c
@@ -0,0 +1,328 @@
+/* $FreeBSD$ */
+
+#include <setjmp.h>
+#include <stdlib.h>
+
+#include "dhcpd.h"
+
+jmp_buf env;
+
+void	expand_domain_search(struct packet *packet);
+
+void
+no_option_present()
+{
+	int ret;
+	struct option_data option;
+	struct packet p;
+
+	option.data = NULL;
+	option.len  = 0;
+	p.options[DHO_DOMAIN_SEARCH] = option;
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (p.options[DHO_DOMAIN_SEARCH].len != 0 ||
+	    p.options[DHO_DOMAIN_SEARCH].data != NULL)
+		abort();
+}
+
+void
+one_domain_valid()
+{
+	int ret;
+	struct packet p;
+	struct option_data *option;
+
+	char *data     = "\007example\003org\0";
+	char *expected = "example.org.";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 13;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (option->len != strlen(expected) ||
+	    strcmp(option->data, expected) != 0)
+		abort();
+
+	free(option->data);
+}
+
+void
+one_domain_truncated1()
+{
+	int ret;
+	struct option_data *option;
+	struct packet p;
+
+	char *data = "\007example\003org";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 12;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (ret != 1)
+		abort();
+
+	free(option->data);
+}
+
+void
+one_domain_truncated2()
+{
+	int ret;
+	struct option_data *option;
+	struct packet p;
+
+	char *data = "\007ex";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 3;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (ret != 1)
+		abort();
+
+	free(option->data);
+}
+
+void
+two_domains_valid()
+{
+	int ret;
+	struct packet p;
+	struct option_data *option;
+
+	char *data     = "\007example\003org\0\007example\003com\0";
+	char *expected = "example.org. example.com.";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 26;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (option->len != strlen(expected) ||
+	    strcmp(option->data, expected) != 0)
+		abort();
+
+	free(option->data);
+}
+
+void
+two_domains_truncated1()
+{
+	int ret;
+	struct option_data *option;
+	struct packet p;
+
+	char *data = "\007example\003org\0\007example\003com";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 25;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (ret != 1)
+		abort();
+
+	free(option->data);
+}
+
+void
+two_domains_truncated2()
+{
+	int ret;
+	struct option_data *option;
+	struct packet p;
+
+	char *data = "\007example\003org\0\007ex";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 16;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (ret != 1)
+		abort();
+
+	free(option->data);
+}
+
+void
+two_domains_compressed()
+{
+	int ret;
+	struct packet p;
+	struct option_data *option;
+
+	char *data     = "\007example\003org\0\006foobar\xc0\x08";
+	char *expected = "example.org. foobar.org.";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 22;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (option->len != strlen(expected) ||
+	    strcmp(option->data, expected) != 0)
+		abort();
+
+	free(option->data);
+}
+
+void
+two_domains_infloop()
+{
+	int ret;
+	struct packet p;
+	struct option_data *option;
+
+	char *data = "\007example\003org\0\006foobar\xc0\x0d";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 22;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (ret != 1)
+		abort();
+
+	free(option->data);
+}
+
+void
+two_domains_forwardptr()
+{
+	int ret;
+	struct packet p;
+	struct option_data *option;
+
+	char *data = "\007example\003org\xc0\x0d\006foobar\0";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 22;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (ret != 1)
+		abort();
+
+	free(option->data);
+}
+
+void
+two_domains_truncatedptr()
+{
+	int ret;
+	struct packet p;
+	struct option_data *option;
+
+	char *data = "\007example\003org\0\006foobar\xc0";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 21;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (ret != 1)
+		abort();
+
+	free(option->data);
+}
+
+void
+multiple_domains_valid()
+{
+	int ret;
+	struct packet p;
+	struct option_data *option;
+
+	char *data =
+	    "\007example\003org\0\002cl\006foobar\003com\0\002fr\xc0\x10";
+
+	char *expected = "example.org. cl.foobar.com. fr.foobar.com.";
+
+	option = &p.options[DHO_DOMAIN_SEARCH];
+	option->len  = 33;
+	option->data = malloc(option->len);
+	memcpy(option->data, data, option->len);
+
+	ret = setjmp(env);
+	if (ret == 0)
+		expand_domain_search(&p);
+
+	if (option->len != strlen(expected) ||
+	    strcmp(option->data, expected) != 0)
+		abort();
+
+	free(option->data);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	no_option_present();
+
+	one_domain_valid();
+	one_domain_truncated1();
+	one_domain_truncated2();
+
+	two_domains_valid();
+	two_domains_truncated1();
+	two_domains_truncated2();
+
+	two_domains_compressed();
+	two_domains_infloop();
+	two_domains_forwardptr();
+	two_domains_truncatedptr();
+
+	multiple_domains_valid();
+
+	return (0);
+}