[gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/

[Tim Harder]

commit:     235c40abc000341e9d85b152dea65e051d4e2601
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 20:16:28 2018 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 20:17:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235c40ab

app-admin/lnav: disable another failing test

Closes: https://bugs.gentoo.org/630916

 .../lnav/files/lnav-0.8.3-disable-tests.patch      | 32 ++++++++++++++++++++++
 app-admin/lnav/lnav-0.8.3.ebuild                   |  9 +-----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch b/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch
new file mode 100644
index 00000000000..1f442afc3fd
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch
@@ -0,0 +1,32 @@
+Disable failing tests for bug #630916.
+
+--- lnav-0.8.3/test/Makefile.am
++++ lnav-0.8.3/test/Makefile.am
+@@ -374,7 +374,6 @@
+ 	test_concise \
+ 	test_line_buffer2 \
+ 	test_line_buffer.sh \
+-	test_listview.sh \
+ 	test_grep_proc.sh \
+ 	test_grep_proc2 \
+ 	test_hist_source \
+@@ -388,18 +387,15 @@
+ 	test_scripts.sh \
+ 	test_sessions.sh \
+ 	test_shlexer.sh \
+-	test_sql.sh \
+ 	test_sql_coll_func.sh \
+ 	test_sql_json_func.sh \
+ 	test_sql_fs_func.sh \
+ 	test_sql_str_func.sh \
+ 	test_sql_time_func.sh \
+-	test_view_colors.sh \
+ 	test_vt52_curses.sh \
+ 	test_top_status \
+ 	test_data_parser.sh \
+-	test_yajlpp \
+-	test_pretty_print.sh
++	test_yajlpp
+ 
+ if HAVE_LIBCURL
+ TESTS += \

diff --git a/app-admin/lnav/lnav-0.8.3.ebuild b/app-admin/lnav/lnav-0.8.3.ebuild
index 5a47db6dfcb..4cc902a0eb9 100644
--- a/app-admin/lnav/lnav-0.8.3.ebuild
+++ b/app-admin/lnav/lnav-0.8.3.ebuild
@@ -25,17 +25,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}"/${P}-disable-tests.patch )
 
 src_prepare() {
 	default
-
-	# skip failing tests
-	sed -i \
-		-e '/test_listview\.sh/d' \
-		-e '/test_view_colors\.sh/d' \
-		-e '/test_sql\.sh/d' \
-		test/Makefile.am || die
-
 	eautoreconf
 }