diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
commit | c719fdcee603a5a706a45d10cb598762d56a727d (patch) | |
tree | 620cbf137661399a3fb1eff92914204f9a970713 /app-admin/lnav/files | |
parent | cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff) |
gentoo resync : 25.09.2021
Diffstat (limited to 'app-admin/lnav/files')
6 files changed, 109 insertions, 43 deletions
diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch new file mode 100644 index 000000000000..5e8c80fb90a5 --- /dev/null +++ b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch @@ -0,0 +1,75 @@ +--- a/test/test_remote.sh ++++ b/test/test_remote.sh +@@ -76,38 +76,38 @@ + error: unable to open file: nonexistent-host: -- failed to ssh to host: ... + EOF + +-run_test ${lnav_test} -d /tmp/lnav.err -n \ +- localhost:nonexistent-file ++# run_test ${lnav_test} -d /tmp/lnav.err -n \ ++# localhost:nonexistent-file + +-check_error_output "no error for nonexistent-file?" <<EOF +-error: unable to open file: localhost:nonexistent-file -- unable to lstat -- ENOENT[2] +-EOF +- +-run_test ${lnav_test} -d /tmp/lnav.err -n \ +- localhost:${test_dir}/logfile_access_log.0 +- +-check_output "could not download remote file?" <<EOF +-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" +-EOF +- +-run_test ${lnav_test} -d /tmp/lnav.err -n \ +- "localhost:${test_dir}/logfile_access_log.*" +- +-check_output "could not download remote file?" <<EOF +-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" +-10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-" +-EOF +- +-run_test ${lnav_test} -d /tmp/lnav.err -n \ +- "localhost:${test_dir}/remote-log-dir" +- +-check_output "could not download remote file?" <<EOF +-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" +-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" +-10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-" +-EOF ++# check_error_output "no error for nonexistent-file?" <<EOF ++# error: unable to open file: localhost:nonexistent-file -- unable to lstat -- ENOENT[2] ++# EOF ++ ++# run_test ${lnav_test} -d /tmp/lnav.err -n \ ++# localhost:${test_dir}/logfile_access_log.0 ++ ++# check_output "could not download remote file?" <<EOF ++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" ++# EOF ++ ++# run_test ${lnav_test} -d /tmp/lnav.err -n \ ++# "localhost:${test_dir}/logfile_access_log.*" ++ ++# check_output "could not download remote file?" <<EOF ++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" ++# 10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-" ++# EOF ++ ++# run_test ${lnav_test} -d /tmp/lnav.err -n \ ++# "localhost:${test_dir}/remote-log-dir" ++ ++# check_output "could not download remote file?" <<EOF ++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7" ++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7" ++# 10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-" ++# EOF diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch new file mode 100644 index 000000000000..c7a49d45f1d7 --- /dev/null +++ b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch @@ -0,0 +1,34 @@ +# Certain tests commented out for stability reasons: +# listview: Fails when building inside sandbox +# mvattrline: Fails on some testers boxes. Documented here: https://github.com/tstack/lnav/issues/911 +# logfile: Flaky. Fails some times and not others. i.e. Race condition +# tui: Can hang the build +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -355,14 +355,14 @@ + test_cli.sh \ + test_cmds.sh \ + test_config.sh \ +- test_listview.sh \ ++ #test_listview.sh \ + test_meta.sh \ +- test_mvwattrline.sh \ ++ #test_mvwattrline.sh \ + test_grep_proc.sh \ + test_grep_proc2 \ + test_json_format.sh \ + test_log_accel \ +- test_logfile.sh \ ++ #test_logfile.sh \ + test_reltime \ + test_remote.sh \ + test_scripts.sh \ +@@ -376,7 +376,7 @@ + test_sql_str_func.sh \ + test_sql_time_func.sh \ + test_sql_xml_func.sh \ +- test_tui.sh \ ++ #test_tui.sh \ + test_data_parser.sh \ + test_pretty_print.sh \ + test_view_colors.sh \ diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch index 47aef6d593da..d2f26a436ff8 100644 --- a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch +++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch @@ -4,12 +4,6 @@ Date: Thu, 31 Dec 2020 23:23:56 -0800 Subject: [PATCH] [tests] fix test to make it insensitive to the current date Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- - test/test_sql.sh | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/test/test_sql.sh b/test/test_sql.sh -index c7480ecc..bbb98dce 100644 --- a/test/test_sql.sh +++ b/test/test_sql.sh @@ -1012,13 +1012,13 @@ EOF @@ -31,6 +25,3 @@ index c7480ecc..bbb98dce 100644 EOF --- -2.31.1 - diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch index 58aa7264a0de..83380fae4d8c 100644 --- a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch +++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch @@ -4,12 +4,6 @@ Date: Thu, 31 Dec 2020 23:26:57 -0800 Subject: [PATCH] [tests] update another date-sensitive test Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- - test/test_sql.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/test/test_sql.sh b/test/test_sql.sh -index bbb98dce..22941c2a 100644 --- a/test/test_sql.sh +++ b/test/test_sql.sh @@ -1023,11 +1023,11 @@ EOF @@ -27,6 +21,3 @@ index bbb98dce..22941c2a 100644 EOF # Create a dummy database for the next couple of tests to consume. --- -2.31.1 - diff --git a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch index e77dd17854e5..0d3ab64282c3 100644 --- a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch +++ b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch @@ -7,16 +7,6 @@ Subject: [PATCH] [logfile] add notes for automatic decisions and fix compile Fixes #864 Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- - m4/ax_cxx_compile_stdcxx.m4 | 462 +++++++++++++++++++++++++++++++++--- - src/base/result.h | 1 + - src/logfile.hh | 13 + - src/optional.hpp | 45 +++- - src/pcrepp/pcrepp.hh | 1 + - 5 files changed, 482 insertions(+), 40 deletions(-) - -diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 -index 2c18e49c..9413da62 100644 --- a/m4/ax_cxx_compile_stdcxx.m4 +++ b/m4/ax_cxx_compile_stdcxx.m4 @@ -1,5 +1,5 @@ diff --git a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch index 9059712242a6..125f86b57a6e 100644 --- a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch +++ b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch @@ -7,14 +7,6 @@ Subject: [PATCH] [view_curses] use VC_ROLE instead of VC_STYLE where possible Fixes #806 Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- - src/highlighter.cc | 4 +++- - src/logfile_sub_source.cc | 17 ++++++++++------- - src/view_curses.cc | 9 ++++++--- - 3 files changed, 19 insertions(+), 11 deletions(-) - -diff --git a/src/highlighter.cc b/src/highlighter.cc -index 24aafebd..110ca03f 100644 --- a/src/highlighter.cc +++ b/src/highlighter.cc @@ -115,7 +115,9 @@ void highlighter::annotate(attr_line_t &al, int start) const @@ -28,8 +20,6 @@ index 24aafebd..110ca03f 100644 } sa.emplace_back(lr, &view_curses::VC_STYLE, attrs); -diff --git a/src/logfile_sub_source.cc b/src/logfile_sub_source.cc -index 14e87002..dce0d4ae 100644 --- a/src/logfile_sub_source.cc +++ b/src/logfile_sub_source.cc @@ -468,25 +468,28 @@ void logfile_sub_source::text_attrs_for_line(textview_curses &lv, @@ -68,8 +58,6 @@ index 14e87002..dce0d4ae 100644 } lr.lr_start = 0; -diff --git a/src/view_curses.cc b/src/view_curses.cc -index 4a36a3ad..2456d53d 100644 --- a/src/view_curses.cc +++ b/src/view_curses.cc @@ -402,13 +402,16 @@ void view_curses::mvwattrline(WINDOW *window, @@ -92,6 +80,3 @@ index 4a36a3ad..2456d53d 100644 attr_range.lr_end = min(line_width_chars, attr_range.lr_end - lr_chars.lr_start); --- -2.31.1 - |