Improve SessionManager constructor and tests

[github/shaarli/Shaarli.git] / Makefile

diff --git a/Makefile b/Makefile
index 40badb1d916bfaa50c58ff08d3af2159872726d3..c2d5594605943f87e16da7dee295acfff5e074ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,16 @@ PHP_COMMA_SOURCE = index.php,application,tests,plugins
 
 all: static_analysis_summary check_permissions test
 
+##
+# Docker test adapter
+#
+# Shaarli sources and vendored libraries are copied from a shared volume
+# to a user-owned directory to enable running tests as a non-root user.
+##
+docker_%:
+       rsync -az /shaarli/ ~/shaarli/
+       cd ~/shaarli && make $*
+
 ##
 # Concise status of the project
 # These targets are non-blocking: || exit 0
@@ -105,7 +115,7 @@ check_permissions:
        @echo "----------------------"
        @echo "Check file permissions"
        @echo "----------------------"
-       @for file in `git ls-files`; do \
+       @for file in `git ls-files | grep -v docker`; do \
                if [ -x $$file ]; then \
                        errors=true; \
                        echo "$${file} is executable"; \
@@ -120,12 +130,12 @@ check_permissions:
 # See phpunit.xml for configuration
 # https://phpunit.de/manual/current/en/appendixes.configuration.html
 ##
-test:
+test: translate
        @echo "-------"
        @echo "PHPUNIT"
        @echo "-------"
        @mkdir -p sandbox coverage
-       @$(BIN)/phpunit --coverage-php coverage/main.cov --testsuite unit-tests
+       @$(BIN)/phpunit --coverage-php coverage/main.cov --bootstrap tests/bootstrap.php --testsuite unit-tests
 
 locale_test_%:
        @UT_LOCALE=$*.utf8 \
@@ -158,15 +168,15 @@ composer_dependencies: clean
        composer install --no-dev --prefer-dist
        find vendor/ -name ".git" -type d -exec rm -rf {} +
 
-### generate a release tarball and include 3rd-party dependencies
-release_tar: composer_dependencies htmldoc
+### generate a release tarball and include 3rd-party dependencies and translations
+release_tar: composer_dependencies htmldoc translate
        git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD
        tar rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/
        tar rvf $(ARCHIVE_VERSION).tar --transform "s|^doc/html|$(ARCHIVE_PREFIX)doc/html|" doc/html/
        gzip $(ARCHIVE_VERSION).tar
 
-### generate a release zip and include 3rd-party dependencies
-release_zip: composer_dependencies htmldoc
+### generate a release zip and include 3rd-party dependencies and translations
+release_zip: composer_dependencies htmldoc translate
        git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD
        mkdir -p $(ARCHIVE_PREFIX)/{doc,vendor}
        rsync -a doc/html/ $(ARCHIVE_PREFIX)doc/html/
@@ -203,3 +213,8 @@ htmldoc:
        mkdocs build'
        find doc/html/ -type f -exec chmod a-x '{}' \;
        rm -r venv
+
+
+### Generate Shaarli's translation compiled file (.mo)
+translate:
+       @find inc/languages/ -name shaarli.po -execdir msgfmt shaarli.po -o shaarli.mo \;
\ No newline at end of file