diff options
| author |  Charles Bailey <cbailey32@bloomberg.net> | 2014-03-29 15:39:01 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-03-31 11:53:24 -0700 |
| commit | 11b53902513c6d59f59594845ce53fe761f0894c (patch) | |
| tree | e7759545bbe659eb1fdc148b055da2a850277699 | |
| parent | dir.c: make git_fnmatch() not inline (diff) | |
| download | tgif-11b53902513c6d59f59594845ce53fe761f0894c.tar.xz | |
tests: don't rely on strerror text when testing rmdir failure
AIX doesn't make a distiction between EEXIST and ENOTEMPTY; relying
on the strerror string for the rmdir failure is fragile. Just test
that the start of the string matches the Git controlled "failed to
rmdir..." error. The exact text of the OS generated error string
isn't important to the test.
Signed-off-by: Charles Bailey <cbailey32@bloomberg.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3600-rm.sh | 3 | ||||
| -rwxr-xr-x | t/t7001-mv.sh | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 3d305814b9..e00d7d2b61 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -711,8 +711,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual git submodule update && git checkout -q HEAD^ 2>actual && git checkout -q master 2>actual && - echo "warning: unable to rmdir submod: Directory not empty" >expected && - test_i18ncmp expected actual && + test_i18ngrep "^warning: unable to rmdir submod:" actual && git status -s submod >actual && echo "?? submod/" >expected && test_cmp expected actual && diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index e3c8c2c1b8..e3290aafe7 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -446,8 +446,7 @@ test_expect_success 'checking out a commit before submodule moved needs manual u git mv sub sub2 && git commit -m "moved sub to sub2" && git checkout -q HEAD^ 2>actual && - echo "warning: unable to rmdir sub2: Directory not empty" >expected && - test_i18ncmp expected actual && + test_i18ngrep "^warning: unable to rmdir sub2:" actual && git status -s sub2 >actual && echo "?? sub2/" >expected && test_cmp expected actual && |