diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2014-04-23 16:34:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-23 15:22:53 -0700 |
| commit | 1c4ea83902e2a64472ccf99ced4ea773ad3dd8aa (patch) | |
| tree | 107ff6437e7687e5b72fb2bec187d79aa4c31ac7 | |
| parent | 779792a5f24bb4e8049c4f88ad752e70d4a8a080 (diff) | |
| download | git-1c4ea83902e2a64472ccf99ced4ea773ad3dd8aa.tar.gz git-1c4ea83902e2a64472ccf99ced4ea773ad3dd8aa.tar.xz | |
git-remote-mediawiki: allow stop/start-ing the test server
Previously, the user had to launch a complete re-install after a lighttpd
stop (e.g. a reboot).
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/mw-to-git/t/install-wiki.sh | 10 | ||||
| -rwxr-xr-x | contrib/mw-to-git/t/test-gitmw-lib.sh | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/contrib/mw-to-git/t/install-wiki.sh b/contrib/mw-to-git/t/install-wiki.sh index 70a53f67f..c215213c4 100755 --- a/contrib/mw-to-git/t/install-wiki.sh +++ b/contrib/mw-to-git/t/install-wiki.sh @@ -20,6 +20,8 @@ usage () { echo " install | -i : Install a wiki on your computer." echo " delete | -d : Delete the wiki and all its pages and " echo " content." + echo " start | -s : Start the previously configured lighttpd daemon" + echo " stop : Stop lighttpd daemon." } @@ -33,6 +35,14 @@ case "$1" in wiki_delete exit 0 ;; + "start" | "-s") + start_lighttpd + exit + ;; + "stop") + stop_lighttpd + exit + ;; "--help" | "-h") usage exit 0 diff --git a/contrib/mw-to-git/t/test-gitmw-lib.sh b/contrib/mw-to-git/t/test-gitmw-lib.sh index 3372b2af3..d9a114995 100755 --- a/contrib/mw-to-git/t/test-gitmw-lib.sh +++ b/contrib/mw-to-git/t/test-gitmw-lib.sh @@ -289,7 +289,6 @@ start_lighttpd () { # Kill daemon lighttpd and removes files and folders associated. stop_lighttpd () { test -f "$WEB_TMP/pid" && kill $(cat "$WEB_TMP/pid") - rm -rf "$WEB" } # Create the SQLite database of the MediaWiki. If the database file already @@ -415,6 +414,7 @@ wiki_reset () { wiki_delete () { if test $LIGHTTPD = "true"; then stop_lighttpd + rm -fr "$WEB" else # Delete the wiki's directory. rm -rf "$WIKI_DIR_INST/$WIKI_DIR_NAME" || |