Fourth batch

diff --git a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
index 811a90c9ae16cec2c99f01daa9d5e1254c9952d8..cfbfe7ddf622c46559c626360970df303a9eb8d1 100755 (executable)
--- a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
+++ b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
@@ -191,10 +191,10 @@ test_expect_success 'Git clone works with the shallow option' '
        test_path_is_file mw_dir_11/Main_Page.mw &&
        (
                cd mw_dir_11 &&
-               test `git log --oneline Nyan.mw | wc -l` -eq 1 &&
-               test `git log --oneline Foo.mw | wc -l` -eq 1 &&
-               test `git log --oneline Bar.mw | wc -l` -eq 1 &&
-               test `git log --oneline Main_Page.mw | wc -l ` -eq 1
+               test $(git log --oneline Nyan.mw | wc -l) -eq 1 &&
+               test $(git log --oneline Foo.mw | wc -l) -eq 1 &&
+               test $(git log --oneline Bar.mw | wc -l) -eq 1 &&
+               test $(git log --oneline Main_Page.mw | wc -l ) -eq 1
        ) &&
        wiki_check_content mw_dir_11/Nyan.mw Nyan &&
        wiki_check_content mw_dir_11/Foo.mw Foo &&
@@ -218,9 +218,9 @@ test_expect_success 'Git clone works with the shallow option with a delete page'
        test_path_is_file mw_dir_12/Main_Page.mw &&
        (
                cd mw_dir_12 &&
-               test `git log --oneline Nyan.mw | wc -l` -eq 1 &&
-               test `git log --oneline Bar.mw | wc -l` -eq 1 &&
-               test `git log --oneline Main_Page.mw | wc -l ` -eq 1
+               test $(git log --oneline Nyan.mw | wc -l) -eq 1 &&
+               test $(git log --oneline Bar.mw | wc -l) -eq 1 &&
+               test $(git log --oneline Main_Page.mw | wc -l ) -eq 1
        ) &&
        wiki_check_content mw_dir_12/Nyan.mw Nyan &&
        wiki_check_content mw_dir_12/Bar.mw Bar &&
@@ -247,7 +247,7 @@ test_expect_success 'Test of resistance to modification of category on wiki for
        wiki_editpage Notconsidered "this page will not appear on local" false &&
        wiki_editpage Othercategory "this page will not appear on local" false -c=Cattwo &&
        wiki_editpage Tobeedited "this page have been modified" true -c=Catone &&
-       wiki_delete_page Tobedeleted
+       wiki_delete_page Tobedeleted &&
        git clone -c remote.origin.categories="Catone" \
                mediawiki::'"$WIKI_URL"' mw_dir_14 &&
        wiki_getallpage ref_page_14 Catone &&