[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - test/run_unit.sh.in

[Andras Timar]

 test/run_unit.sh.in |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 7e90dedd6c8b846705655d0980d0f938bbf50974
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Mar 28 08:51:14 2017 +0200

    use SSL certs from build dir in unit tests
    
    Change-Id: If0bf245d8acb6873802c9054cb8bb30aa1005ad4
    (cherry picked from commit 2a64ae7bc08cfd89f9323027721b458ebf19dd3b)

diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index 54e4d3fd..df6fb155 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -74,6 +74,8 @@ if test "z$tst" == "z"; then
                                  --o:storage.filesystem[@allow]=true \
                                  --o:logging.level=trace \
                                  --o:ssl.key_file_path="${abs_top_builddir}/etc/key.pem" \
+                                 --o:ssl.cert_file_path="${abs_top_builddir}/etc/cert.pem" \
+                                 --o:ssl.ca_file_path="${abs_top_builddir}/etc/ca-chain.cert.pem" \
                                  --o:admin_console.username=admin --o:admin_console.password=admin \
                                  > "$tst_log" 2>&1 &
      echo "  executing test"
@@ -103,6 +105,8 @@ else # newer unit tests.
                                    --o:storage.filesystem[@allow]=true \
                                    --o:logging.level=trace \
                                    --o:ssl.key_file_path="${abs_top_builddir}/etc/key.pem" \
+                                   --o:ssl.cert_file_path="${abs_top_builddir}/etc/cert.pem" \
+                                   --o:ssl.ca_file_path="${abs_top_builddir}/etc/ca-chain.cert.pem" \
                                    --o:admin_console.username=admin --o:admin_console.password=admin \
                                    --unitlib=".libs/$tst.so" > "$tst_log" 2>&1; then
         echo "Test $tst passed."
@@ -117,6 +121,8 @@ else # newer unit tests.
         echo "         --o:storage.filesystem[@allow]=true \\"
         echo "         --o:logging.level=trace \\"
         echo "         --o:ssl.key_file_path=\"${abs_top_builddir}/etc/key.pem\" \\"
+        echo "         --o:ssl.cert_file_path=\"${abs_top_builddir}/etc/cert.pem\" \\"
+        echo "         --o:ssl.ca_file_path=\"${abs_top_builddir}/etc/ca-chain.cert.pem\" \\"
         echo "         --o:admin_console.username=admin --o:admin_console.password=admin \\"
         echo "         --unitlib=\".libs/$tst.so\""
         echo "============================================================="