diff options
| author |  David Bremner <david@tethera.net> | 2013-11-23 07:01:16 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2013-11-23 20:25:29 -0400 |
| commit | 2560996b7ebb08cca7e20fbb182998bc2e0e2151 (patch) | |
| tree | 02de6fe2a830465e39b8c53b201792cb4fd415bc /test/test-lib.sh | |
| parent | 9c25d4bbf02d8c1902f1c166125afaf93419c3d7 (diff) | |
test: replace $PWD with YYY in emacs & emacs-show tests
When executed command line is written to *Notmuch errors* buffer,
shell-quote-argument will backslash-escape any char that is not in
"POSIX filename characters" (i.e. matching "[^-0-9a-zA-Z_./\n]").
Currently in two emacs tests shell has expanded $PWD as part of
emacs variable, which will later be fed to #'shell-quote-argument
and finally written to ERROR file. If $PWD contained non-POSIX
filename characters, data in ERROR file will not match $PWD when
later comparing in shell. Therefore, in these two particular cases
the escaped $PWD is replaced with YYY in ERROR file and expected
content is adjusted accordingly.
Diffstat (limited to 'test/test-lib.sh')
| -rw-r--r-- | test/test-lib.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index 2aa4dfc9..8611ba5e 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -628,6 +628,17 @@ notmuch_json_show_sanitize () -e 's|"filename": "/[^"]*",|"filename": "YYYYY",|g' } +notmuch_emacs_error_sanitize () +{ + local command=$1 + shift + for file in "$@"; do + echo "=== $file ===" + cat "$file" + done | sed \ + -e 's/^\[.*\]$/[XXX]/' \ + -e "s|^\(command: \)\{0,1\}/.*/$command|\1YYY/$command|" +} # End of notmuch helper functions # Use test_set_prereq to tell that a particular prerequisite is available. |