Re: [PATCH] t5300-pack-object.sh: portability issue using /usr/bin/stat
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:03
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] t5300-pack-object.sh: portability issue using /usr/bin/stat · Arjen Laarhoven <hidden>
- 2016-06-15 · Re: [PATCH] t5300-pack-object.sh: portability issue using /usr/bin/stat · Randal L. Schwartz <hidden>
- 2016-06-15 · Re: [PATCH] t5300-pack-object.sh: portability issue using /usr/bin/stat · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] t5300-pack-object.sh: portability issue using /usr/bin/stat · Nicolas Pitre <hidden>
arjen@yaph.org (Arjen Laarhoven) writes:
In the test 'compare delta flavors', /usr/bin/stat is used to get file size. This isn't portable. There already is a dependency on Perl, use its '-s' operator to get the file size.
If you do use Perl, then you do not want to do it as two separate invocations with their result compared with test. How about this on top of your patch?
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index a400e7a..5710a23 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh@@ -123,11 +123,13 @@ test_expect_success \ done' cd "$TRASH" -test_expect_success \ - 'compare delta flavors' \ - 'size_2=`perl -e "print -s q[test-2-${packname_2}.pack]"` && - size_3=`perl -e "print -s q[test-3-${packname_3}.pack]"` && - test $size_2 -gt $size_3' +test_expect_success 'compare delta flavors' ' + perl -e " + exit ( ((-s q[test-2-${packname_2}.pack]) > + (-s q[test-3-${packname_3}.pack])) + ? 0 : 1); + " +' rm -fr .git2 mkdir .git2