1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
|
Description: Do not run unit tests that require readline
Author: Rafael Laboissière <rafael@debian.org>
Forwarded: not-needed
Last-Update: 2024-04-18
--- fim-0.7.0.orig/Makefile.am
+++ fim-0.7.0/Makefile.am
@@ -167,12 +167,12 @@ endif
$(NO_ASAN) $(TIMEOUT_LARGE) \
$(FIM_EXE) $(FIMNORCOPTS) $(top_srcdir)/media/ -o aa=w $(FIMVIDEOTESTOPTS); \
fi
-if WANT_READLINE
+if WANT_READLINE_TEST_DISABLED_FOR_DEBIAN
if test -n "$(DISPLAY)"; then $(NO_ASAN) $(FIM_EXE) $(FIMNORCOPTS) $(top_srcdir)/media/ -o aa=w -C '_debug_commands="k"' -K:quit -K '' | grep pressed.key; fi # readline mode key verbosity
endif
@if test -n "$(DISPLAY)"; then make autodevtests; fi
# extras for readline and caption related:
-if WANT_READLINE
+if WANT_READLINE_TEST_DISABLED_FOR_DEBIAN
$(NO_ASAN) $(FIM_EXE) $(FIMNORCOPTS) -o aa $(top_srcdir)/media/ -K :' 'ne' '' ' -K '' -Kq # completion_display_matches_hook
$(NO_ASAN) $(FIM_EXE) $(FIMNORCOPTS) -o aa $(top_srcdir)/media/ -K :' 'n=x' '' ' -K '' -Kq # cover completion of variables
echo q | $(NO_ASAN) $(FIM_EXE) $(FIMNORCOPTS) -o aa $(top_srcdir)/media/ -K : # cover fim_rl_getc
@@ -192,7 +192,7 @@ endif
$(NO_ASAN) $(TIMEOUT_LARGE) \
$(FIM_EXE) $(FIMNORCOPTS) $(top_srcdir)/media/ -o ca=w $(FIMVIDEOTESTOPTS); \
fi
-if WANT_READLINE
+if WANT_READLINE_TEST_DISABLED_FOR_DEBIAN
if test -n "$(DISPLAY)"; then $(NO_ASAN) $(FIM_EXE) $(FIMNORCOPTS) $(top_srcdir)/media/ -o ca=w -C '_debug_commands="k"' -K:quit -K '' | grep pressed.key; fi # readline mode key verbosity
endif
@if test -n "$(DISPLAY)"; then make autodevtests; fi
@@ -679,7 +679,7 @@ endif
$(FIM_EXE) $(FIMNORCOPTS) -o dumb $(top_srcdir)/media/numbers_pcx/* --// media/numbers_pcx/4.___ -c 'stdout _fileindex;if(_fileindex!=1){quit 255}quit'
$(FIM_EXE) $(FIMNORCOPTS) -o dumb $(top_srcdir)/media/numbers_pcx/* --// media/numbers_pcx/4.pcx -c 'stdout _fileindex;if(_fileindex!=5){quit 255}quit'
endif
-if ENABLE_HISTORY
+if ENABLE_HISTORY_TEST_DISABLED_FOR_DEBIAN
if ENABLE_PCX
test "`$(FIM_EXE) $(FIMNORCOPTS) -o dumb $(top_srcdir)/media/numbers_pcx/ -K /pcx -K q -F 'stdout _fileindex'`" -lt "`$(FIM_EXE) $(FIMNORCOPTS) -o dumb $(top_srcdir)/media/numbers_pcx/ -K /pcx -K .q -F 'stdout _fileindex'`" # 2 -lt 3 (. after / does repeat action)
endif
@@ -771,11 +771,11 @@ else
endif
test `$(FIM_EXE) $(FIMNORCOPTS) $(top_srcdir)/media/ -o dumb -X --etc-fimrc $(top_srcdir)/scripts/example/set_var.fim -c 'stdout variable;quit' $(SNTZ)` = '0' # note: --no-rc-file and --etc-fimrc are incompatible
$(FIM_EXE) $(FIMNORCOPTS) $(top_srcdir)/media/ -o dumb -X --no-internal-config -c 'width;quit !(i:width == 0)'
-if WANT_READLINE
+if WANT_READLINE_TEST_DISABLED_FOR_DEBIAN
$(FIM_EXE) $(FIMNORCOPTS) $(top_srcdir)/media/ -o dumb --no-commandline -K ':quit 10' # quits at second char
rm -f record.fim; $(FIM_EXE) $(FIMNORCOPTS) $(top_srcdir)/media/ -o dumb -W record.fim -K ':quit 10' -K ''; grep -q quit.10 record.fim && rm record.fim
endif
-if ENABLE_HISTORY
+if ENABLE_HISTORY_TEST_DISABLED_FOR_DEBIAN
$(FIM_EXE) $(FIMNORCOPTS) $(top_srcdir)/media/ -o dumb --no-history --no-history-load --no-history-save -kq # FIXME: bogus test
rm -f .fim_history && HOME=`pwd` $(FIM_EXE) -N --no-etc-fimrc-file $(top_srcdir)/media/ -o dumb -C 'next;next' -c quit && grep -q '^next;next' .fim_history && rm .fim_history # note: history file may contain spaces newlines etc
endif
@@ -879,7 +879,7 @@ endif
test `$(FIM_EXE) $(FIMNORCOPTS) -o dumb $(top_srcdir)/media -c "bind 'F1' 'stdout 1';_max_iterated_commands=2;" -k 10F1 -k q | tr -d '\n' $(SNTZ)` = 11 # test binding repeat and F1 binding
test `$(FIM_EXE) $(FIMNORCOPTS) -o dumb $(top_srcdir)/media -c "bind 'F1' 'stdout 1';_max_iterated_commands=1;" -k 10F1 -k q | tr -d '\n' $(SNTZ)` = 1 # test binding repeat and F1 binding
test `$(FIM_EXE) $(FIMNORCOPTS) -o dumb $(top_srcdir)/media -c "bind 'F1' 'stdout 1';_max_iterated_commands=0;" -k 10F1 -k q | tr -d '\n' $(SNTZ)` = 1111111111 # test binding repeat and F1 binding
-if WANT_READLINE
+if WANT_READLINE_TEST_DISABLED_FOR_DEBIAN
if ENABLE_GIF
cp -p $(top_srcdir)/media/icon_smile.gif $(top_srcdir)/media/icon_smile.pgm
cp -p $(top_srcdir)/media/icon_smile.gif $(top_srcdir)/media/icon_smile.ppm
@@ -906,7 +906,7 @@ if ENABLE_GIF
endif
test "`$(FIM_EXE) $(FIMNORCOPTS) -o dumb $(top_srcdir)/media -c 'stderr; stdout; quit' 2>&1 > /dev/null | grep echo`" = "echo command" # stdout vs stderr
test `$(FIM_EXE) $(FIMNORCOPTS) -o dumb $(top_srcdir)/media -c 'stderr "out:due";stdout "out:uno";quit' 2>&1 > /dev/null | grep out $(SNTZ)` = "out:due" # stdout vs stderr
-if WANT_READLINE
+if WANT_READLINE_TEST_DISABLED_FOR_DEBIAN
test `$(FIM_EXE) $(FIMNORCOPTS) -o dumb $(top_srcdir)/media -C set_commandline_mode -K 'stdout "cli"; quit;' -K '' $(SNTZ)` = cli
endif
test `$(FIM_EXE) $(FIMNORCOPTS) -o dumb -c 'set; stdout _last_cmd_output; quit' | wc -w` -ge 50 # test set
--- fim-0.7.0.orig/configure.ac
+++ fim-0.7.0/configure.ac
@@ -677,6 +677,8 @@ if test x$have_readline = xyes; then
fi
fi
AM_CONDITIONAL(WANT_READLINE, test x$have_readline = xyes)
+AM_CONDITIONAL(WANT_READLINE_TEST_DISABLED_FOR_DEBIAN, false)
+AM_CONDITIONAL(ENABLE_HISTORY_TEST_DISABLED_FOR_DEBIAN, false)
dnl ============= jpeg file handling
|