From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Jun 2017 00:03:16 +0000 (+0900)
Subject: Merge branch 'tb/dedup-crlf-tests' into maint
X-Git-Tag: v2.13.1~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/86799c1c616a10bfb6089f80dd0648f82b2defad?ds=inline;hp=-c

Merge branch 'tb/dedup-crlf-tests' into maint

* tb/dedup-crlf-tests:
t0027: tests are not expensive; remove t0025
---

86799c1c616a10bfb6089f80dd0648f82b2defad
diff --combined t/t0027-auto-crlf.sh
index 81609af7bb,effc3db0d5..deb3ae7813
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@@ -4,12 -4,6 +4,6 @@@ test_description='CRLF conversion all c
  
  . ./test-lib.sh
  
- if ! test_have_prereq EXPENSIVE
- then
- 	skip_all="EXPENSIVE not set"
- 	test_done
- fi
- 
  compare_files () {
  	tr '\015\000' QN <"$1" >"$1".expect &&
  	tr '\015\000' QN <"$2" | tr -d 'Z' >"$2".actual &&
@@@ -75,7 -69,7 +69,7 @@@ check_warning () 
  	*) echo >&2 "Illegal 1": "$1" ; return false ;;
  	esac
  	grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" | uniq  >"$2".actual
 -	test_cmp "$2".expect "$2".actual
 +	test_i18ncmp "$2".expect "$2".actual
  }
  
  commit_check_warn () {