summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Bailey <cbailey32@bloomberg.net>2014-03-29 15:39:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-31 18:53:24 (GMT)
commit11b53902513c6d59f59594845ce53fe761f0894c (patch)
treee7759545bbe659eb1fdc148b055da2a850277699
parent1f26ce615ab4b74cdd018e5d543138c2d188c3d8 (diff)
downloadgit-11b53902513c6d59f59594845ce53fe761f0894c.zip
git-11b53902513c6d59f59594845ce53fe761f0894c.tar.gz
git-11b53902513c6d59f59594845ce53fe761f0894c.tar.bz2
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-xt/t3600-rm.sh3
-rwxr-xr-xt/t7001-mv.sh3
2 files changed, 2 insertions, 4 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 3d30581..e00d7d2 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 e3c8c2c..e3290aa 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 &&