[Libreoffice-commits] online.git: Makefile.am test/UnitAdmin.cpp

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Jan 23 08:06:22 UTC 2019


 Makefile.am        |    3 ---
 test/UnitAdmin.cpp |    6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit d11056deaa3a0238459614d57e03f4c3ad4f2e51
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Jan 23 09:05:58 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Jan 23 09:06:04 2019 +0100

    test: use the more effective overload accepting a character for find_last_of()
    
    Instead of the one that takes a string literal consisting of a single
    character.
    
    Also remove the clang-tidy target, 'run-clang-tidy' does a better job of
    doing the same today.
    
    Change-Id: I58f55a0e64af42694d55f9588f25618164275852

diff --git a/Makefile.am b/Makefile.am
index a70bb68a7..62f74125c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -374,9 +374,6 @@ clean-cache cache-clean:
 	test -n "@LOOLWSD_CACHEDIR@" && rm -rf "@LOOLWSD_CACHEDIR@"/[0-9a-f]
 	test -n "@TILECACHE_PATH@" && rm -rf "@TILECACHE_PATH@"/[0-9a-f]
 
-clang-tidy:
-	parallel clang-tidy -header-filter=^$(PWD).* -- $(shell git ls-files|grep /.*cpp$$|grep -v test)
-
 # After building loolforkit, set its capabilities as required. Do it
 # already after a plain 'make' to allow for testing without
 # installing. When building for packaging, no need for this, as the
diff --git a/test/UnitAdmin.cpp b/test/UnitAdmin.cpp
index acc058e46..bbc0cca62 100644
--- a/test/UnitAdmin.cpp
+++ b/test/UnitAdmin.cpp
@@ -229,7 +229,7 @@ private:
             StringTokenizer tokens(_messageReceived, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
             if (tokens.count() != 5 ||
                 tokens[0] != "adddoc" ||
-                tokens[2] != documentPath1.substr(documentPath1.find_last_of("/") + 1) )
+                tokens[2] != documentPath1.substr(documentPath1.find_last_of('/') + 1) )
             {
                 LOG_INF("testAddDocNotify: Unrecognized message format");
                 return TestResult::Failed;
@@ -257,7 +257,7 @@ private:
             StringTokenizer tokens(_messageReceived, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
             if (tokens.count() != 5 ||
                 tokens[0] != "adddoc" ||
-                tokens[2] != documentPath1.substr(documentPath1.find_last_of("/") + 1) )
+                tokens[2] != documentPath1.substr(documentPath1.find_last_of('/') + 1) )
             {
                 LOG_INF("testAddDocNotify: Unrecognized message format");
                 return TestResult::Failed;
@@ -292,7 +292,7 @@ private:
             StringTokenizer tokens(_messageReceived, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
             if (tokens.count() != 5 ||
                 tokens[0] != "adddoc" ||
-                tokens[2] != documentPath2.substr(documentPath2.find_last_of("/") + 1) )
+                tokens[2] != documentPath2.substr(documentPath2.find_last_of('/') + 1) )
             {
                 LOG_INF("testAddDocNotify: Unrecognized message format");
                 return TestResult::Failed;


More information about the Libreoffice-commits mailing list