test/run_unit.sh.in | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit bba5b1e7e453c8f0e735dc322626d60ba9f33f90
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Oct 14 09:48:21 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Oct 14 10:04:36 2019 +0200
test: don't validate ssl certificates while running unit tests
Which was the case before commit
5d57f5aef38d08196952bf22cd310001cbedea1e (storage.ssl.enable should be
in sync with ssl.enable by default, 2019-10-11), otherwise we fail to
connect to the test wsd, since its certificate is typically not trusted.
With this
make check CPPUNIT_TEST_NAME="unit-copy-paste"
passes again.
Change-Id: If3a8a293831313e74eacc1cbc092922d2c72f08c
diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index 582dbf27e..d05e2f48f 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -96,6 +96,7 @@ if test "z$tst" == "z"; then
--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 \
+ --o:storage.ssl.enable=false \
> "$tst_log" 2>&1 &
if test "z${SLEEPFORDEBUGGER}${SLEEPKITFORDEBUGGER}" != "z"; then
echo "sleeping for debugger"
@@ -134,6 +135,7 @@ else # newer unit tests.
--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 \
+ --o:storage.ssl.enable=false \
--unitlib="${abs_top_builddir}/test/.libs/$tst.so" 2> "$tst_log"; then
echo "Test $tst passed."
echo ":test-result: PASS $tst" >> $test_output
@@ -144,6 +146,7 @@ else # newer unit tests.
echo " $ gdb --args ${abs_top_builddir}/loolwsd
--o:sys_template_path=\"$systemplate_path\" \\"
echo " --o:child_root_path=\"$jails_path\" \\"
echo " --o:storage.filesystem[@allow]=true \\"
+ echo " --o:storage.ssl.enable=false \\"
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\" \\"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
