[Libreoffice-commits] online.git: test/run_unit.sh.in wsd/README

[Miklos Vajna (via logerrit)]

 test/run_unit.sh.in |   10 ----------
 wsd/README          |    7 +++----
 2 files changed, 3 insertions(+), 14 deletions(-)

New commits:
commit 6add8295bf8372307351d91591154b9b7a257f65
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Jan 23 17:56:00 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jan 24 00:09:34 2020 +0100

    test: remove documentation about no longer working CPPUNIT_TEST_NAME variant
    
    This is not needed, the commandline to run the test is printed on
    failure.
    
    Change-Id: Ia4da4344ede4ad8c1627a5560f1bc1264f4203c7
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87288
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index e6f4da579..4b893f23c 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -56,16 +56,6 @@ echo "	$cmd_line"
 # drop .la suffix
 tst=`echo $tst | sed "s/\.la//"`;
 
-if test "z$tst" != "z" && test "z$CPPUNIT_TEST_NAME" != "z"; then
-    # $tst is not empty, but $CPPUNIT_TEST_NAME is set, exit early if they
-    # don't match.
-    if test "z$tst" != "z$CPPUNIT_TEST_NAME"; then
-        touch $tst_log
-        echo ":test-result: SKIP $tst (disabled by CPPUNIT_TEST_NAME)" > $test_output
-        exit 0;
-    fi
-fi
-
 export LOOL_LOGLEVEL=trace
 
 if test "z$enable_debug" != "ztrue"; then
diff --git a/wsd/README b/wsd/README
index e56b970c6..a91314cd8 100644
--- a/wsd/README
+++ b/wsd/README
@@ -265,11 +265,10 @@ Set LOOL_DEBUG=1 to trap SIGSEGV and SEGBUS and prompt for debugger.
 
 if you choose PAUSEFORDEBUGGER send the signal SIGUSR1 to resume the process
 
-In order to run and debug one unit test, set CPPUNIT_TEST_NAME to something
-non-empty:
+In order to run and debug one unit test, run the commandline that is printed
+when the test fails. To run one single CppUnit test from a suite, additionally use:
 
-    make check CPPUNIT_TEST_NAME="unit-prefork"
-    make check CPPUNIT_TEST_NAME="HTTPWSTest::testCalcEditRendering"
+    CPPUNIT_TEST_NAME="HTTPWSTest::testCalcEditRendering" <printed commandline>
 
 Protocol description
 --------------------