patch, 2 partssolaris test fixups

Due to the alignment bug in another thread, I had the pleasure of visiting my old friend Solaris 9 today. The tests _almost_ all run out of the box.

This series features two minor fixes:

  [1/2]: t7501: fix "empty commit" test with NO_PERL
  [2/2]: t7700: do not use "touch -r"

I had a few other failures related to encodings; I suspect the problem is simply that the machine in question doesn't have eucJP support at all.

The big one that I did not fix is in t7001-mv. We do this:

  test_must_fail git mv some-file no-such-dir/

and assume that it will fail. It doesn't. Solaris happily renames some-file to a regular file named "no-such-dir". So we fail later during the index-update, complaining about adding the entry "no-such-dir/", but still exit(0) at the end. I'm mostly willing to just call Solaris crazy for allowing the rename (Linux returns ENOTDIR), but I do wonder if the index codepath could be improved (and especially to return an error).

-Peff

t7501.9 tries to check that "git commit" will fail when the index is unchanged. It relies on previous tests not to have modified the index. When it was originally written, this was always the case. However, commit c65dc35 (t7501: test the right kind of breakage, 2012-03-30) changed earlier tests (4 and 5) to leave a modification in the index.

We never noticed, however, because t7501.7, between the two, clears the index state as a side effect. However, that test depends on the PERL prerequisite, and so it does not always run. Therefore if NO_PERL is set, we do not run the intervening test, the index is left unclean, and t7501.9 fails.

We could fix this by moving t7501.9 up in the script. However, this patch instead leaves it in place and adds a "git reset" before the commit. This makes the test more explicit about its preconditions, and will future-proof it against any other changes in the test state.

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t7501-commit.sh | 1 +
 1 file changed, 1 insertion(+)

Some versions of touch (such as /usr/ucb/touch on Solaris) do not know about the "-r" option. This would make sense as a feature of test-chmtime, but fortunately this fix is even easier. The test does not care about the timestamp of the .keep file it creates at all, only that it exists. So we can simply drop the use of "-r".

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t7700-repack.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Jeff King <peff@peff.net> writes:

Please refrain from using "touch" for such use cases in the first place. It appears that

	>pack-$packsha1.keep &&

is what the test wants.

On Thu, Jan 23, 2014 at 01:12:55PM -0800, Junio C Hamano wrote:

Agreed. I was making the minimal change, but I think there is no reason not to fix both while we are there. Do you want to just mark up the patch in transit?

-Peff

Jeff King <peff@peff.net> writes:

Let's just queue this instead.

-- >8 --
From: Jeff King <peff@peff.net>
Date: Thu, 23 Jan 2014 14:55:18 -0500
Subject: [PATCH] t7700: do not use "touch" unnecessarily

Some versions of touch (such as /usr/ucb/touch on Solaris) do not know about the "-r" option. This would make sense as a feature of test-chmtime, but fortunately this fix is even easier.

The test does not care about the timestamp of the .keep file it creates at all, only that it exists. For such a use case, with or without portability issues around "-r", "touch" should not be used in the first place.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t7700-repack.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

On Thu, Jan 23, 2014 at 01:24:44PM -0800, Junio C Hamano wrote:

That's what I meant. :)

Thanks, looks good to me.

-Peff

Jeff King <peff@peff.net> writes:

I think j6t has a patch for that, a8933469 (mv: let 'git mv file no-such-dir/' error out on Windows, too, 2014-01-08).

On Thu, Jan 23, 2014 at 12:52:30PM -0800, Junio C Hamano wrote:

Ah yeah, that looks like exactly the same issue (and the fix looks sane from my cursory investigation). Thanks for the pointer. I wasn't planning to look further into it, but now I can do so without feeling guilty. :)

-Peff