From 27f7e3b2177b6968563fc85e61acd48540c48ab1 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Tue, 14 May 2013 09:54:16 -0700 Subject: [PATCH] misc/vim: test.sh seems to only work on Mac OS X. cmp(1) on FreeBSD requires two file arguments. grep -P on Linux (at least Ubuntu 12.04) is described in the man page as "This is highly experimental" and doesn't seem to work. On FreeBSD the man page states "This option is not supported in FreeBSD." Needed this to work while debugging some funky behavior of 'Import' in my local vim setup. R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/7675043 --- misc/vim/ftplugin/go/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/vim/ftplugin/go/test.sh b/misc/vim/ftplugin/go/test.sh index a6e31d8a3c..d8a5b89511 100755 --- a/misc/vim/ftplugin/go/test.sh +++ b/misc/vim/ftplugin/go/test.sh @@ -29,13 +29,13 @@ test_one() { vim -e -s -u /dev/null -U /dev/null --noplugin -c "source import.vim" \ -c "$1" -c 'wq! test.go' base.go # ensure blank lines are treated correctly - if ! gofmt test.go | cmp test.go; then + if ! gofmt test.go | cmp test.go -; then echo 2>&1 "gofmt conflict" gofmt test.go | diff -u test.go - | sed "s/^/ /" 2>&1 fail=1 return fi - if ! grep -P -q "(?s)$2" test.go; then + if ! [[ $(cat test.go) =~ $2 ]]; then echo 2>&1 "$2 did not match" cat test.go | sed "s/^/ /" 2>&1 fail=1 -- 2.48.1