From 93884ef3f9269a87896f31b0c7d1c4b6b96a9cb2 Mon Sep 17 00:00:00 2001 From: eadler Date: Sat, 2 Jun 2018 21:50:00 +0000 Subject: [PATCH] indent(1) in stable/11 is known to be incomplete or incorrect in some ways. Since the code is not planned for MFC, just remove the failing tests. This is a direct commit to stable/11 as the issue does not affect -current. Discussed with; pstef PR: 228491 --- usr.bin/indent/tests/Makefile | 15 ------------- usr.bin/indent/tests/elsecomment.0 | 18 --------------- usr.bin/indent/tests/elsecomment.0.pro | 2 -- usr.bin/indent/tests/elsecomment.0.stdout | 22 ------------------- usr.bin/indent/tests/list_head.0 | 16 -------------- usr.bin/indent/tests/list_head.0.stdout | 14 ------------ usr.bin/indent/tests/sac.0 | 4 ---- usr.bin/indent/tests/sac.0.pro | 2 -- usr.bin/indent/tests/sac.0.stdout | 6 ----- usr.bin/indent/tests/types_from_file.0 | 3 --- usr.bin/indent/tests/types_from_file.0.list | 2 -- usr.bin/indent/tests/types_from_file.0.pro | 2 -- usr.bin/indent/tests/types_from_file.0.stdout | 3 --- 13 files changed, 109 deletions(-) delete mode 100644 usr.bin/indent/tests/elsecomment.0 delete mode 100644 usr.bin/indent/tests/elsecomment.0.pro delete mode 100644 usr.bin/indent/tests/elsecomment.0.stdout delete mode 100644 usr.bin/indent/tests/list_head.0 delete mode 100644 usr.bin/indent/tests/list_head.0.stdout delete mode 100644 usr.bin/indent/tests/sac.0 delete mode 100644 usr.bin/indent/tests/sac.0.pro delete mode 100644 usr.bin/indent/tests/sac.0.stdout delete mode 100644 usr.bin/indent/tests/types_from_file.0 delete mode 100644 usr.bin/indent/tests/types_from_file.0.list delete mode 100644 usr.bin/indent/tests/types_from_file.0.pro delete mode 100644 usr.bin/indent/tests/types_from_file.0.stdout diff --git a/usr.bin/indent/tests/Makefile b/usr.bin/indent/tests/Makefile index 01fa04aca75..b0d7a05ae20 100644 --- a/usr.bin/indent/tests/Makefile +++ b/usr.bin/indent/tests/Makefile @@ -8,33 +8,18 @@ ${PACKAGE}FILES+= comments.0 ${PACKAGE}FILES+= comments.0.stdout ${PACKAGE}FILES+= declarations.0 ${PACKAGE}FILES+= declarations.0.stdout -${PACKAGE}FILES+= elsecomment.0 -${PACKAGE}FILES+= elsecomment.0.stdout -${PACKAGE}FILES+= elsecomment.0.pro ${PACKAGE}FILES+= float.0 ${PACKAGE}FILES+= float.0.stdout -${PACKAGE}FILES+= label.0 -${PACKAGE}FILES+= label.0.stdout -${PACKAGE}FILES+= label.0.pro -${PACKAGE}FILES+= list_head.0 -${PACKAGE}FILES+= list_head.0.stdout ${PACKAGE}FILES+= nsac.0 ${PACKAGE}FILES+= nsac.0.stdout ${PACKAGE}FILES+= nsac.0.pro ${PACKAGE}FILES+= offsetof.0 ${PACKAGE}FILES+= offsetof.0.stdout -${PACKAGE}FILES+= sac.0 -${PACKAGE}FILES+= sac.0.stdout -${PACKAGE}FILES+= sac.0.pro ${PACKAGE}FILES+= struct.0 ${PACKAGE}FILES+= struct.0.stdout ${PACKAGE}FILES+= surplusbad.0 ${PACKAGE}FILES+= surplusbad.0.stdout ${PACKAGE}FILES+= surplusbad.0.pro -${PACKAGE}FILES+= types_from_file.0 -${PACKAGE}FILES+= types_from_file.0.stdout -${PACKAGE}FILES+= types_from_file.0.list -${PACKAGE}FILES+= types_from_file.0.pro ${PACKAGE}FILES+= wchar.0 ${PACKAGE}FILES+= wchar.0.stdout diff --git a/usr.bin/indent/tests/elsecomment.0 b/usr.bin/indent/tests/elsecomment.0 deleted file mode 100644 index 6744e19e077..00000000000 --- a/usr.bin/indent/tests/elsecomment.0 +++ /dev/null @@ -1,18 +0,0 @@ -/* $FreeBSD$ */ -/* See r303484 and r309342 */ -void t(void) { - if (0) { - - } /* Old indent would remove the following blank line */ - - /* - * test - */ - - if (1) - ; - else /* Old indent would get very confused here */ - { - - } -} diff --git a/usr.bin/indent/tests/elsecomment.0.pro b/usr.bin/indent/tests/elsecomment.0.pro deleted file mode 100644 index 892386ffbf4..00000000000 --- a/usr.bin/indent/tests/elsecomment.0.pro +++ /dev/null @@ -1,2 +0,0 @@ -/* $FreeBSD$ */ --bl diff --git a/usr.bin/indent/tests/elsecomment.0.stdout b/usr.bin/indent/tests/elsecomment.0.stdout deleted file mode 100644 index ce78e1701e4..00000000000 --- a/usr.bin/indent/tests/elsecomment.0.stdout +++ /dev/null @@ -1,22 +0,0 @@ -/* $FreeBSD$ */ -/* See r303484 and r309342 */ -void -t(void) -{ - if (0) - { - - } /* Old indent would remove the following - * blank line */ - - /* - * test - */ - - if (1) - ; - else /* Old indent would get very confused here */ - { - - } -} diff --git a/usr.bin/indent/tests/list_head.0 b/usr.bin/indent/tests/list_head.0 deleted file mode 100644 index 3a186ca33e0..00000000000 --- a/usr.bin/indent/tests/list_head.0 +++ /dev/null @@ -1,16 +0,0 @@ -/* $FreeBSD$ */ -/* See r309380 */ -static int -do_execve(td, args, mac_p) - struct thread *td; - struct image_args *args; - struct mac *mac_p; -{ - -} - -static LIST_HEAD(, alq) ald_active; -static int ald_shuttingdown = 0; -struct thread *ald_thread; - - diff --git a/usr.bin/indent/tests/list_head.0.stdout b/usr.bin/indent/tests/list_head.0.stdout deleted file mode 100644 index b6f076241a0..00000000000 --- a/usr.bin/indent/tests/list_head.0.stdout +++ /dev/null @@ -1,14 +0,0 @@ -/* $FreeBSD$ */ -/* See r309380 */ -static int -do_execve(td, args, mac_p) - struct thread *td; - struct image_args *args; - struct mac *mac_p; -{ - -} - -static LIST_HEAD(, alq) ald_active; -static int ald_shuttingdown = 0; -struct thread *ald_thread; diff --git a/usr.bin/indent/tests/sac.0 b/usr.bin/indent/tests/sac.0 deleted file mode 100644 index 449eadf3ae0..00000000000 --- a/usr.bin/indent/tests/sac.0 +++ /dev/null @@ -1,4 +0,0 @@ -/* $FreeBSD$ */ -void t(void) { - int a = (double) 8; -} diff --git a/usr.bin/indent/tests/sac.0.pro b/usr.bin/indent/tests/sac.0.pro deleted file mode 100644 index ad5cf1a8093..00000000000 --- a/usr.bin/indent/tests/sac.0.pro +++ /dev/null @@ -1,2 +0,0 @@ -/* $FreeBSD$ */ --sac diff --git a/usr.bin/indent/tests/sac.0.stdout b/usr.bin/indent/tests/sac.0.stdout deleted file mode 100644 index a0e2e71362c..00000000000 --- a/usr.bin/indent/tests/sac.0.stdout +++ /dev/null @@ -1,6 +0,0 @@ -/* $FreeBSD$ */ -void -t(void) -{ - int a = (double) 8; -} diff --git a/usr.bin/indent/tests/types_from_file.0 b/usr.bin/indent/tests/types_from_file.0 deleted file mode 100644 index 6efca24fe1b..00000000000 --- a/usr.bin/indent/tests/types_from_file.0 +++ /dev/null @@ -1,3 +0,0 @@ -/* $FreeBSD$ */ -/* See r303735 */ -void t(a *x, b *y, c *z); diff --git a/usr.bin/indent/tests/types_from_file.0.list b/usr.bin/indent/tests/types_from_file.0.list deleted file mode 100644 index 5f733616b1b..00000000000 --- a/usr.bin/indent/tests/types_from_file.0.list +++ /dev/null @@ -1,2 +0,0 @@ -b -a \ No newline at end of file diff --git a/usr.bin/indent/tests/types_from_file.0.pro b/usr.bin/indent/tests/types_from_file.0.pro deleted file mode 100644 index eeca804be08..00000000000 --- a/usr.bin/indent/tests/types_from_file.0.pro +++ /dev/null @@ -1,2 +0,0 @@ -/* $FreeBSD$ */ --Utypes_from_file.0.list diff --git a/usr.bin/indent/tests/types_from_file.0.stdout b/usr.bin/indent/tests/types_from_file.0.stdout deleted file mode 100644 index 8776ca6ba88..00000000000 --- a/usr.bin/indent/tests/types_from_file.0.stdout +++ /dev/null @@ -1,3 +0,0 @@ -/* $FreeBSD$ */ -/* See r303735 */ -void t(a *x, b *y, c * z); -- 2.45.0