From 08b984fb5456c23b04c573f9021141ce27af707d Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Fri, 6 Apr 2007 01:42:04 -0400 Subject: Distinguish branches by more than case in tests. The renaming without config test changed a branch from q to Q, which fails on non-case sensitive file systems. Change the test to use q and q2. Signed-off-by: Junio C Hamano --- t/t3200-branch.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 't') diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index ce2c5f41f..3ca1a325d 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -85,9 +85,9 @@ test_expect_failure \ mv .git/config .git/config-saved -test_expect_success 'git branch -m q Q without config should succeed' ' - git-branch -m q Q && - git-branch -m Q q +test_expect_success 'git branch -m q q2 without config should succeed' ' + git-branch -m q q2 && + git-branch -m q2 q ' mv .git/config-saved .git/config -- cgit v1.2.1 From 4c84f0dcc630817aaf71049163ee63b96d543a38 Mon Sep 17 00:00:00 2001 From: Arjen Laarhoven Date: Sat, 7 Apr 2007 01:48:54 +0200 Subject: t3200-branch.sh: small language nit Signed-off-by: Junio C Hamano --- t/t3200-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 3ca1a325d..828d553a4 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -11,7 +11,7 @@ handled. Specifically, that a bogus branch is not created. . ./test-lib.sh test_expect_success \ - 'prepare an trivial repository' \ + 'prepare a trivial repository' \ 'echo Hello > A && git-update-index --add A && git-commit -m "Initial commit." && -- cgit v1.2.1 From d93f7c1817f8b9e8bbb2e8ed70e87e84bc55b9f2 Mon Sep 17 00:00:00 2001 From: Arjen Laarhoven Date: Sat, 7 Apr 2007 01:49:03 +0200 Subject: t5300-pack-object.sh: portability issue using /usr/bin/stat 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. Signed-off-by: Arjen Laarhoven Signed-off-by: Junio C Hamano --- t/t5300-pack-object.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 't') diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index 35e036a86..083095f7f 100755 --- a/t/t5300-pack-object.sh +++ b/t/t5300-pack-object.sh @@ -123,11 +123,12 @@ test_expect_success \ done' cd "$TRASH" -test_expect_success \ - 'compare delta flavors' \ - 'size_2=`stat -c "%s" test-2-${packname_2}.pack` && - size_3=`stat -c "%s" test-3-${packname_3}.pack` && - test $size_2 -gt $size_3' +test_expect_success 'compare delta flavors' ' + perl -e '\'' + defined($_ = -s $_) or die for @ARGV; + exit 1 if $ARGV[0] <= $ARGV[1]; + '\'' test-2-$packname_2.pack test-3-$packname_3.pack +' rm -fr .git2 mkdir .git2 -- cgit v1.2.1