Merge branch 'doc/test-persistence-setup-clarify' into 'master'

Doc: make "Testing persistence-setup" clearer

See merge request tails/tails!84

wiki/src/contribute/release_process/persistence-setup.mdwn

@@ -2,7 +2,9 @@
 
 [[!toc levels=1]]
 
-Everything on this page happens in the
+Persistence-setup is not currently integrated with `run_test_suite`.
+
+To run it, follow these instructions, making sure that you are in the
 `config/chroot_local-includes/usr/src/persistence-setup` directory.
 
 Pre-requisites
@@ -10,28 +12,33 @@ Pre-requisites
 
 * a Debian Stretch (or newer) system
 * [[Install perl5lib's dependencies|perl5lib#build-deps]]
-* Environment:
-  - Export location of a checkout of the `stable` branch of the main
-    Tails Git repository:
-
-        export TAILS_GIT_CHECKOUT="/path/to/your/tails/git/repo"
 
 Install test dependencies
 =========================
 
-    cat $(git rev-parse --show-toplevel)/config/chroot_local-packageslists/tails-persistence-setup.list \
+    cd "$(git rev-parse --show-toplevel)/config/chroot_local-includes/usr/src/persistence-setup" && \
+    cat "$(git rev-parse --show-toplevel)/config/chroot_local-packageslists/tails-persistence-setup.list" \
        | grep -E -v '^#' \
        | xargs sudo apt --yes install && \
     sudo apt install \
        libdist-zilla-plugin-test-notabs-perl \
        libdist-zilla-plugin-test-perl-critic-perl \
-       libdist-zilla-app-command-authordebs-perl && \
-    dzil authordebs --install
+       libdist-zilla-app-command-authordebs-perl \
+       libtest-most-perl \
+       libtest-spec-perl \
+       libtest-bdd-cucumber-perl \
+       liblwp-online-perl \
+       libdata-dumper-concise-perl \
+       libtest-fatal-perl \
+       libsys-statistics-linux-perl \
+    && dzil authordebs --install
 
 Run the test suite
 ==================
 
-    PERL5LIB="${TAILS_GIT_CHECKOUT}/config/chroot_local-includes/usr/src/perl5lib/lib" \
+    cd "$(git rev-parse --show-toplevel)/config/chroot_local-includes/usr/src/persistence-setup" && \
+    PERL5LIB="$(git rev-parse --show-toplevel)/config/chroot_local-includes/usr/src/perl5lib/lib" \
+       TAILS_GIT_CHECKOUT="$(git rev-parse --show-toplevel)" \
        RELEASE_TESTING=1 \
        LC_ALL=C \
        fakeroot dzil test