flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dont use grep -P for cross-platform compatibility

Browse Source 
`grep -P` gives access to the PCRE matching engine, which is nice,
however, the version of grep shipped on many BSD systems (including
Darwin) does not have this flag.

Currently, `grep -P` was being used in the `_includes()` test helper.

For cross platform compatibility in tests, do not rely upon this option.
Luckily, all existing tests seem to work fine without it already!
This commit is contained in:
Matthew Rothenberg
2014-10-16 12:19:11 -04:00
parent f056d28b2e
commit b395596496
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/lib/git/shell_shortcuts_test.sh
View File

@@ -82,7 +82,7 @@ test_ls_with_file_shortcuts() {
ls_with_file_shortcuts > $temp_file ls_with_file_shortcuts > $temp_file
ls_output=$(<$temp_file strip_colors) ls_output=$(<$temp_file strip_colors)
# Compare as fixed strings (F), instead of regex (P) # Compare as fixed strings (F), instead of normal grep behavior
assertIncludes "$ls_output" '[1] a "b"' F assertIncludes "$ls_output" '[1] a "b"' F
assertIncludes "$ls_output" "[2] a 'b'" F assertIncludes "$ls_output" "[2] a 'b'" F
assertIncludes "$ls_output" '[3] a [b]' F assertIncludes "$ls_output" '[3] a [b]' F

3
test/support/test_helper.sh
View File

@@ -34,7 +34,7 @@ verboseGitCommands() {
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
_includes() { _includes() {
if [ -n "$3" ]; then regex="$3"; else regex=P; fi if [ -n "$3" ]; then regex="$3"; else regex=''; fi
if echo "$1" | grep -q$regex "$2"; then echo 0; else echo 1; fi if echo "$1" | grep -q$regex "$2"; then echo 0; else echo 1; fi
} }
@@ -46,4 +46,3 @@ assertIncludes() {
assertNotIncludes() { assertNotIncludes() {
assertFalse "'$1' should not have contained '$2'" $(_includes "$@") assertFalse "'$1' should not have contained '$2'" $(_includes "$@")
} }