From dd0a21ede0998ec790c37865c7dc119814ac7745 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 16 May 2011 00:10:14 -0700 Subject: [PATCH 1/2] git-grep: update tests now regexp type is "last one wins" Signed-off-by: Junio C Hamano --- t/t7810-grep.sh | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 2a31eca5f2..e845218f67 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -637,20 +637,4 @@ test_expect_success LIBPCRE 'grep -P -w pattern' ' test_cmp expected actual ' -test_expect_success LIBPCRE 'grep -P -F returns error' ' - test_expect_code 128 git grep -P -F main -' - -test_expect_success LIBPCRE 'grep -P -E returns error' ' - test_expect_code 128 git grep -P -E main -' - -test_expect_failure LIBPCRE 'grep -P -G returns error' ' - test_expect_code 128 git grep -P -G main -' - -test_expect_failure LIBPCRE 'grep -P -E -G returns error' ' - test_expect_code 128 git grep -P -E -G main -' - test_done From a80dff25152f43e8a9a688943cb5f67d2ad76fc4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 16 May 2011 00:11:53 -0700 Subject: [PATCH 2/2] Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS Otherwise we would fail to rebuild correctly when this option was changed between $(MAKE) invocations, and more importantly, $(MAKE) test would not pass it down and t/test-lib.sh would not set the LIBPCRE prerequisite. Signed-off-by: Junio C Hamano --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index fea55c04dd..c449f5d6de 100644 --- a/Makefile +++ b/Makefile @@ -2109,6 +2109,7 @@ GIT-BUILD-OPTIONS: FORCE @echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@ @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@ @echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@ + @echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@ @echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@ @echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@ ifdef GIT_TEST_CMP