From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Jun 2014 19:18:50 +0000 (-0700)
Subject: Merge branch 'sk/test-cmp-bin'
X-Git-Tag: v2.1.0-rc0~104
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c651ccc91d1f0f67752b22fab6bfaab9cc327fe8?ds=inline;hp=-c

Merge branch 'sk/test-cmp-bin'

* sk/test-cmp-bin:
t5000, t5003: do not use test_cmp to compare binary files
---

c651ccc91d1f0f67752b22fab6bfaab9cc327fe8
diff --combined t/t5000-tar-tree.sh
index 74fc5a88ec,4efaf8c58e..bad84a36e8
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@@ -123,7 -123,7 +123,7 @@@ test_expect_success 
      'add files to repository' \
      'find a -type f | xargs git update-index --add &&
       find a -type l | xargs git update-index --add &&
 -     treeid=`git write-tree` &&
 +     treeid=$(git write-tree) &&
       echo $treeid >treeid &&
       git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \
       git commit-tree $treeid </dev/null)'
@@@ -164,7 -164,7 +164,7 @@@ check_tar with_olde-prefix olde
  test_expect_success 'git archive on large files' '
      test_config core.bigfilethreshold 1 &&
      git archive HEAD >b3.tar &&
-     test_cmp b.tar b3.tar
+     test_cmp_bin b.tar b3.tar
  '
  
  test_expect_success \
@@@ -173,15 -173,15 +173,15 @@@
  
  test_expect_success \
      'git archive vs. the same in a bare repo' \
-     'test_cmp b.tar b3.tar'
+     'test_cmp_bin b.tar b3.tar'
  
  test_expect_success 'git archive with --output' \
      'git archive --output=b4.tar HEAD &&
-     test_cmp b.tar b4.tar'
+     test_cmp_bin b.tar b4.tar'
  
  test_expect_success 'git archive --remote' \
      'git archive --remote=. HEAD >b5.tar &&
-     test_cmp b.tar b5.tar'
+     test_cmp_bin b.tar b5.tar'
  
  test_expect_success \
      'validate file modification time' \
@@@ -198,7 -198,7 +198,7 @@@ test_expect_success 
  
  test_expect_success 'git archive with --output, override inferred format' '
  	git archive --format=tar --output=d4.zip HEAD &&
- 	test_cmp b.tar d4.zip
+ 	test_cmp_bin b.tar d4.zip
  '
  
  test_expect_success \
@@@ -207,7 -207,7 +207,7 @@@
  
  test_expect_success 'clients cannot access unreachable commits' '
  	test_commit unreachable &&
 -	sha1=`git rev-parse HEAD` &&
 +	sha1=$(git rev-parse HEAD) &&
  	git reset --hard HEAD^ &&
  	git archive $sha1 >remote.tar &&
  	test_must_fail git archive --remote=. $sha1 >remote.tar
@@@ -215,7 -215,7 +215,7 @@@
  
  test_expect_success 'upload-archive can allow unreachable commits' '
  	test_commit unreachable1 &&
 -	sha1=`git rev-parse HEAD` &&
 +	sha1=$(git rev-parse HEAD) &&
  	git reset --hard HEAD^ &&
  	git archive $sha1 >remote.tar &&
  	test_config uploadarchive.allowUnreachable true &&
@@@ -244,34 -244,34 +244,34 @@@ test_expect_success 'archive --list sho
  test_expect_success 'invoke tar filter by format' '
  	git archive --format=tar.foo HEAD >config.tar.foo &&
  	tr ab ba <config.tar.foo >config.tar &&
- 	test_cmp b.tar config.tar &&
+ 	test_cmp_bin b.tar config.tar &&
  	git archive --format=bar HEAD >config.bar &&
  	tr ab ba <config.bar >config.tar &&
- 	test_cmp b.tar config.tar
+ 	test_cmp_bin b.tar config.tar
  '
  
  test_expect_success 'invoke tar filter by extension' '
  	git archive -o config-implicit.tar.foo HEAD &&
- 	test_cmp config.tar.foo config-implicit.tar.foo &&
+ 	test_cmp_bin config.tar.foo config-implicit.tar.foo &&
  	git archive -o config-implicit.bar HEAD &&
- 	test_cmp config.tar.foo config-implicit.bar
+ 	test_cmp_bin config.tar.foo config-implicit.bar
  '
  
  test_expect_success 'default output format remains tar' '
  	git archive -o config-implicit.baz HEAD &&
- 	test_cmp b.tar config-implicit.baz
+ 	test_cmp_bin b.tar config-implicit.baz
  '
  
  test_expect_success 'extension matching requires dot' '
  	git archive -o config-implicittar.foo HEAD &&
- 	test_cmp b.tar config-implicittar.foo
+ 	test_cmp_bin b.tar config-implicittar.foo
  '
  
  test_expect_success 'only enabled filters are available remotely' '
  	test_must_fail git archive --remote=. --format=tar.foo HEAD \
  		>remote.tar.foo &&
  	git archive --remote=. --format=bar >remote.bar HEAD &&
- 	test_cmp remote.bar config.bar
+ 	test_cmp_bin remote.bar config.bar
  '
  
  test_expect_success GZIP 'git archive --format=tgz' '
@@@ -280,27 -280,27 +280,27 @@@
  
  test_expect_success GZIP 'git archive --format=tar.gz' '
  	git archive --format=tar.gz HEAD >j1.tar.gz &&
- 	test_cmp j.tgz j1.tar.gz
+ 	test_cmp_bin j.tgz j1.tar.gz
  '
  
  test_expect_success GZIP 'infer tgz from .tgz filename' '
  	git archive --output=j2.tgz HEAD &&
- 	test_cmp j.tgz j2.tgz
+ 	test_cmp_bin j.tgz j2.tgz
  '
  
  test_expect_success GZIP 'infer tgz from .tar.gz filename' '
  	git archive --output=j3.tar.gz HEAD &&
- 	test_cmp j.tgz j3.tar.gz
+ 	test_cmp_bin j.tgz j3.tar.gz
  '
  
  test_expect_success GZIP 'extract tgz file' '
  	gzip -d -c <j.tgz >j.tar &&
- 	test_cmp b.tar j.tar
+ 	test_cmp_bin b.tar j.tar
  '
  
  test_expect_success GZIP 'remote tar.gz is allowed by default' '
  	git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
- 	test_cmp j.tgz remote.tar.gz
+ 	test_cmp_bin j.tgz remote.tar.gz
  '
  
  test_expect_success GZIP 'remote tar.gz can be disabled' '
diff --combined t/test-lib-functions.sh
index f5815350d3,cf7b41f66d..c617c826db
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@@ -617,6 -617,12 +617,12 @@@ test_cmp() 
  	$GIT_TEST_CMP "$@"
  }
  
+ # test_cmp_bin - helper to compare binary files
+ 
+ test_cmp_bin() {
+ 	cmp "$@"
+ }
+ 
  # Check if the file expected to be empty is indeed empty, and barfs
  # otherwise.
  
@@@ -717,11 -723,6 +723,11 @@@ test_ln_s_add () 
  	fi
  }
  
 +# This function writes out its parameters, one per line
 +test_write_lines () {
 +	printf "%s\n" "$@"
 +}
 +
  perl () {
  	command "$PERL_PATH" "$@"
  }