summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-03 12:38:38 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-03 12:38:38 -0700
commit8ba87adad637b402fb309754e213ec40b74e4f18 (patch)
treeca8a9e5b21b53890ae499ad60f636e0882c93c3e /t
parent400ecca8c10520ced800b4fcdd5bdeb94bd2a556 (diff)
parent11b53902513c6d59f59594845ce53fe761f0894c (diff)
downloadgit-8ba87adad637b402fb309754e213ec40b74e4f18.tar.gz
Merge branch 'cb/aix'
* cb/aix: tests: don't rely on strerror text when testing rmdir failure dir.c: make git_fnmatch() not inline
Diffstat (limited to 't')
-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 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 215d43d6a6..34fb1afbb3 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -447,8 +447,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 &&