From 048d601a85089ee7a3020bc59a83be2ff0ee3296 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Sat, 11 Mar 2017 14:55:58 +0100 Subject: [PATCH] Update tests --- Makefile.am | 2 - configure.ac | 10 +- doc/help-output.txt | 248 --------------------------------------- doc/test_xr.txt | 12 -- test/help_output_test.sh | 2 +- test/xr_config_test.sh | 13 -- test/xr_dump_test.sh | 2 +- 7 files changed, 8 insertions(+), 281 deletions(-) delete mode 100755 test/xr_config_test.sh diff --git a/Makefile.am b/Makefile.am index da5ab542..1964cbc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -457,8 +457,6 @@ test-x: $(bin_PROGRAMS) $(top_srcdir)/test/run_test.sh 215 $(top_srcdir)/test/run_regex_test.sh $(top_builddir) echo "Test dmenu glob" $(top_srcdir)/test/run_test.sh 216 $(top_srcdir)/test/run_glob_test.sh $(top_builddir) - echo "Test config dump" - $(top_srcdir)/test/run_test.sh 218 $(top_srcdir)/test/xr_config_test.sh $(top_builddir) $(top_srcdir) echo "Test issue 333" $(top_srcdir)/test/run_test.sh 221 $(top_srcdir)/test/run_issue333_test.sh $(top_builddir) echo "Test help output" diff --git a/configure.ac b/configure.ac index c994d81a..f4f0f678 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,9 @@ AC_INIT([rofi], [1.3.1], [https://github.com/DaveDavenport/rofi/],[],[https://fo AC_CONFIG_SRCDIR([source/rofi.c]) AC_CONFIG_HEADER([config.h]) +dnl --------------------------------------------------------------------- +dnl Lex & Bison language parser. +dnl --------------------------------------------------------------------- AC_PROG_LEX AC_PROG_YACC @@ -51,12 +54,10 @@ dnl --------------------------------------------------------------------- dnl Enable source code coverage reporting for GCC dnl --------------------------------------------------------------------- -AC_ARG_ENABLE(gcov, - [ --enable-gcov Enable source code coverage testing using gcov], +AC_ARG_ENABLE(gcov, [ --enable-gcov Enable source code coverage testing using gcov], [AM_CFLAGS="${AM_CFLAGS} -coverage"]) AS_IF([test "x${enable_gcov}" = "xyes" ], [AC_DEFINE([ENABLE_GCOV], [1], [Enable gcov profiling])]) -AC_ARG_ENABLE(asan, - [ --enable-asan asan], +AC_ARG_ENABLE(asan, [ --enable-asan asan], [AM_CFLAGS="${AM_CFLAGS} -fsanitize=address -fno-omit-frame-pointer -g3"]) AS_IF([test "x${enable_asan}" = "xyes" ], [AC_DEFINE([ENABLE_ASAN], [1], [Enable libasan])]) @@ -66,6 +67,7 @@ dnl DRun dialog dnl -------------------------------------------------------------------- AC_ARG_ENABLE([drun], AC_HELP_STRING([--disable-drun],[Disable desktop file run dialog])) AS_IF([test "x${enable_drun}" != "xno"], [AC_DEFINE([ENABLE_DRUN], [1], [Enable desktop file run dialog])]) + dnl --------------------------------------------------------------------- dnl Disable window mode dnl --------------------------------------------------------------------- diff --git a/doc/help-output.txt b/doc/help-output.txt index 30894060..d8072ba3 100644 --- a/doc/help-output.txt +++ b/doc/help-output.txt @@ -36,251 +36,3 @@ DMENU command line options: -sync Force dmenu to first read all input data, then show dialog. -async-pre-read [number] Read several entries blocking before switching to async mode 25 -Global options: - -modi [string] Enabled modi - combi,drun (File) - -width [number] Window width - 50 (File) - -lines [number] Number of lines - 8 (File) - -columns [number] Number of columns - 1 (File) - -font [string] Font to use - Source Code Pro Medium 10 (File) - -color-normal [string] Color scheme for normal row - argb:0000000, #a2b5df, argb:3affffff, #a2b5df, #02143f (File) - -color-urgent [string] Color scheme for urgent row - argb:0000000, #ff817f, argb:3affffff, #ff817f, #02143f (File) - -color-active [string] Color scheme for active row - argb:0000000, #6aa4ff, argb:3affffff, #6aa4ff, #02143f (File) - -color-window [string] Color scheme window - argb:ee02143f, #a2b5df, #a2b5df (File) - -bw [number] Border width - 2 (File) - -location [number] Location on screen - 2 (File) - -padding [number] Padding - 2 (File) - -yoffset [number] Y-offset relative to location - -2 (File) - -xoffset [number] X-offset relative to location - 0 (File) - -[no-]fixed-num-lines Always show number of lines - True (File) - -terminal [string] Terminal to use - sakura (File) - -ssh-client [string] Ssh client to use - ssh (File) - -ssh-command [string] Ssh command to execute - {terminal} -e {ssh-client} {host} (File) - -run-command [string] Run command to execute - bash -c "{cmd}" (File) - -run-list-command [string] Command to get extra run targets - (Default) - -run-shell-command [string] Run command to execute that runs in shell - {terminal} -e {cmd} (File) - -window-command [string] Command executed on accep-entry-custom for window modus - xkill -id {window} (File) - -[no-]disable-history Disable history in run/ssh - False (File) - -[no-]sort Use sorting - False (Default) - -[no-]levenshtein-sort Use levenshtein sorting also for fuzzy matching - False (File) - -[no-]case-sensitive Set case-sensitivity - False (File) - -[no-]cycle Cycle through the results list - True (File) - -[no-]sidebar-mode Enable sidebar-mode - False (File) - -eh [number] Row height (in chars) - 1 (File) - -[no-]auto-select Enable auto select mode - False (File) - -[no-]parse-hosts Parse hosts file for ssh mode - False (File) - -[no-]parse-known-hosts Parse known_hosts file for ssh mode - True (File) - -combi-modi [string] Set the modi to combine in combi mode - window,drun,run,ssh (File) - -matching [string] Set the matching algorithm. (normal, regex, glob, fuzzy) - normal (Default) - -[no-]tokenize Tokenize input string - True (File) - -m [string] Monitor id to show on - -1 (File) - -line-margin [number] Margin between rows - 3 (File) - -line-padding [number] Padding within rows - 1 (Default) - -filter [string] Pre-set filter - (unset) (Default) - -separator-style [string] Separator style (none, dash, solid) - solid (File) - -[no-]hide-scrollbar Hide scroll-bar - False (File) - -[no-]fullscreen Fullscreen - False (File) - -[no-]fake-transparency Fake transparency - False (File) - -dpi [number] DPI - 101 (File) - -threads [number] Threads to use for string matching - 8 (File) - -scrollbar-width [number] Scrollbar width - 8 (File) - -scroll-method [number] Scrolling method. (0: Page, 1: Centered) - 0 (File) - -fake-background [string] Background to use for fake transparency. (background or screenshot) - screenshot (File) - -window-format [string] Window Format. w (desktop name), t (title), n (name), r (role), c (class) - w c t (File) - -[no-]click-to-exit Click outside the window to exit - True (Default) - -[no-]show-match Indicate how it match by underlining it. - True (Default) - -theme [string] New style theme file - (unset) (Default) - -pid [string] Pidfile location - /tmp/rofi.pid (File) - -kb-primary-paste [string] Paste primary selection - Control+Shift+v,Shift+Insert (File) - -kb-secondary-paste [string] Paste clipboard - Control+v,Insert (File) - -kb-clear-line [string] Clear input line - Control+u (File) - -kb-move-front [string] Beginning of line - Control+a (File) - -kb-move-end [string] End of line - Control+e (File) - -kb-move-word-back [string] Move back one word - Alt+b (File) - -kb-move-word-forward [string] Move forward one word - Alt+f (File) - -kb-move-char-back [string] Move back one char - Left,Control+b (File) - -kb-move-char-forward [string] Move forward one char - Right,Control+f (File) - -kb-remove-word-back [string] Delete previous word - Control+Alt+h,Control+BackSpace (File) - -kb-remove-word-forward [string] Delete next word - Control+Alt+d (File) - -kb-remove-char-forward [string] Delete next char - Delete,Control+d (File) - -kb-remove-char-back [string] Delete previous char - BackSpace,Control+h (File) - -kb-remove-to-eol [string] Delete till the end of line - Control+k (File) - -kb-remove-to-sol [string] Delete till the start of line - Control+u (File) - -kb-accept-entry [string] Accept entry - Control+j,Control+m,Return,KP_Enter (File) - -kb-accept-custom [string] Use entered text as command (in ssh/run modi) - Control+Return (File) - -kb-accept-alt [string] Use alternate accept command. - Shift+Return (File) - -kb-delete-entry [string] Delete entry from history - Shift+Delete (File) - -kb-mode-next [string] Switch to the next mode. - Shift+Right,Control+Tab (File) - -kb-mode-previous [string] Switch to the previous mode. - Shift+Left,Control+Shift+Tab (File) - -kb-row-left [string] Go to the previous column - Control+Page_Up (File) - -kb-row-right [string] Go to the next column - Control+Page_Down (File) - -kb-row-up [string] Select previous entry - Up,Control+p,Shift+Tab (File) - -kb-row-down [string] Select next entry - Down,Control+n (File) - -kb-row-tab [string] Go to next row, if one left, accept it, if no left next mode. - Tab (File) - -kb-page-prev [string] Go to the previous page - Page_Up (File) - -kb-page-next [string] Go to the next page - Page_Down (File) - -kb-row-first [string] Go to the first entry - Home,KP_Home (File) - -kb-row-last [string] Go to the last entry - End,KP_End (File) - -kb-row-select [string] Set selected item as input text - Control+space (File) - -kb-screenshot [string] Take a screenshot of the rofi window - Alt+S (File) - -kb-toggle-case-sensitivity [string] Toggle case sensitivity - grave,dead_grave (File) - -kb-toggle-sort [string] Toggle sort - Alt+grave (File) - -kb-cancel [string] Quit rofi - Escape,Control+bracketleft (File) - -kb-custom-1 [string] Custom keybinding 1 - Alt+1 (File) - -kb-custom-2 [string] Custom keybinding 2 - Alt+2 (File) - -kb-custom-3 [string] Custom keybinding 3 - Alt+3 (File) - -kb-custom-4 [string] Custom keybinding 4 - Alt+4 (File) - -kb-custom-5 [string] Custom Keybinding 5 - Alt+5 (File) - -kb-custom-6 [string] Custom keybinding 6 - Alt+6 (File) - -kb-custom-7 [string] Custom Keybinding 7 - Alt+7 (File) - -kb-custom-8 [string] Custom keybinding 8 - Alt+8 (File) - -kb-custom-9 [string] Custom keybinding 9 - Alt+9 (File) - -kb-custom-10 [string] Custom keybinding 10 - Alt+0 (File) - -kb-custom-11 [string] Custom keybinding 11 - Alt+Shift+1 (File) - -kb-custom-12 [string] Custom keybinding 12 - Alt+at (File) - -kb-custom-13 [string] Csutom keybinding 13 - Alt+numbersign (File) - -kb-custom-14 [string] Custom keybinding 14 - Alt+dollar (File) - -kb-custom-15 [string] Custom keybinding 15 - Alt+percent (File) - -kb-custom-16 [string] Custom keybinding 16 - Alt+dead_circumflex (File) - -kb-custom-17 [string] Custom keybinding 17 - Alt+ampersand (File) - -kb-custom-18 [string] Custom keybinding 18 - Alt+asterisk (File) - -kb-custom-19 [string] Custom Keybinding 19 - Alt+parenleft (File) - -kb-select-1 [string] Select row 1 - Super+1 (Default) - -kb-select-2 [string] Select row 2 - Super+2 (Default) - -kb-select-3 [string] Select row 3 - Super+3 (Default) - -kb-select-4 [string] Select row 4 - Super+4 (Default) - -kb-select-5 [string] Select row 5 - Super+5 (Default) - -kb-select-6 [string] Select row 6 - Super+6 (Default) - -kb-select-7 [string] Select row 7 - Super+7 (Default) - -kb-select-8 [string] Select row 8 - Super+8 (Default) - -kb-select-9 [string] Select row 9 - Super+9 (Default) - -kb-select-10 [string] Select row 10 - Super+0 (Default) - -display-ssh [string] The display name of this browser -  (File) - -display-run [string] The display name of this browser -  (File) - -display-drun [string] The display name of this browser -  (File) - -display-window [string] The display name of this browser -  (File) - -display-windowcd [string] The display name of this browser - windowcd (File) - -display-combi [string] The display name of this browser - combi (File) - diff --git a/doc/test_xr.txt b/doc/test_xr.txt index 03e71321..d5633628 100644 --- a/doc/test_xr.txt +++ b/doc/test_xr.txt @@ -232,15 +232,3 @@ rofi.kb-custom-19: Alt+parenleft ! rofi.kb-select-9: Super+9 ! "Select row 10" Set from: Default ! rofi.kb-select-10: Super+0 -! "The display name of this browser" Set from: File -rofi.display-ssh:  -! "The display name of this browser" Set from: File -rofi.display-run:  -! "The display name of this browser" Set from: File -rofi.display-drun:  -! "The display name of this browser" Set from: File -rofi.display-window:  -! "The display name of this browser" Set from: File -rofi.display-windowcd: windowcd -! "The display name of this browser" Set from: File -rofi.display-combi: combi diff --git a/test/help_output_test.sh b/test/help_output_test.sh index b5f96388..f3787a9f 100755 --- a/test/help_output_test.sh +++ b/test/help_output_test.sh @@ -2,7 +2,7 @@ TOP_DIR=$1 -rofi -h -config ${TOP_DIR}/doc/test_xr.txt | awk 'BEGIN{ found=1} /^Monitor/{found=0} {if (found) print }' > help-output.txt +rofi -h -config ${TOP_DIR}/doc/test_xr.txt | awk 'BEGIN{ found=1} /^Global options:/{found=0} {if (found) print }' > help-output.txt if ! diff help-output.txt ${TOP_DIR}/doc/help-output.txt > /dev/null then diff --git a/test/xr_config_test.sh b/test/xr_config_test.sh deleted file mode 100755 index 76c13e8d..00000000 --- a/test/xr_config_test.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -TOP_DIR=$1 - -rofi -dump-xresources -config ${TOP_DIR}/doc/test_xr.txt > temp.txt - -if ! diff temp.txt ${TOP_DIR}/doc/test_xr.txt > /dev/null -then - echo "Dump xresources does not match." - exit 1; -fi - -exit ${RETV} diff --git a/test/xr_dump_test.sh b/test/xr_dump_test.sh index 29be1a57..00460dc3 100755 --- a/test/xr_dump_test.sh +++ b/test/xr_dump_test.sh @@ -3,7 +3,7 @@ TOP_DIR=$1 xrdb -retain -load ${TOP_DIR}/doc/test_xr.txt -rofi -config ${TOP_DIR}/doc/test_xr.txt -dump-xresources > temp.txt +rofi -config ${TOP_DIR}/doc/test_xr.txt -dump-xresources | grep -v "rofi.display-" | grep -v "The display name of this browser" > temp.txt if ! diff temp.txt ${TOP_DIR}/doc/test_xr.txt > /dev/null then