Merge pull request #2351 from keepassxreboot/feature/coverage

Improve test coverage, reformat CMakeFiles, and cleanup CLI
keepassxreboot · Oct 19, 2018 · c749f70 · c749f70
2 parents b8d2d5d + 77adbef
commit c749f70
Show file tree

Hide file tree

Showing 92 changed files with 3,333 additions and 2,128 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Dockerfile b/Dockerfile
@@ -57,7 +57,9 @@ RUN set -x \
         mesa-common-dev \
         libyubikey-dev \
         libykpers-1-dev \
-        libqrencode-dev
+        libqrencode-dev \
+        xclip \
+        xvfb
 
 ENV PATH="/opt/${QT5_VERSION}/bin:${PATH}"
 ENV CMAKE_PREFIX_PATH="/opt/${QT5_VERSION}/lib/cmake"

diff --git a/ci/trusty/Dockerfile b/ci/trusty/Dockerfile
@@ -39,6 +39,7 @@ RUN set -x \
         clang-3.6 \
         libclang-common-3.6-dev \
         clang-format-3.6 \
+        llvm-3.6 \
         cmake3 \
         make \
         libgcrypt20-18-dev \
@@ -56,6 +57,7 @@ RUN set -x \
         libxi-dev \
         libxtst-dev \
         libqrencode-dev \
+        xclip \
         xvfb
 
 ENV PATH="/opt/${QT5_VERSION}/bin:${PATH}"

diff --git a/cmake/CLangFormat.cmake b/cmake/CLangFormat.cmake
@@ -14,45 +14,43 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set(EXCLUDED_DIRS
-    # third-party directories
-    zxcvbn/
-    streams/QtIOCompressor
-    # objective-c directories
-    autotype/mac
-)
+        # third-party directories
+        zxcvbn/
+        streams/QtIOCompressor
+        # objective-c directories
+        autotype/mac)
 
 set(EXCLUDED_FILES
-    # third-party files
-    streams/qtiocompressor.cpp
-    streams/qtiocompressor.h
-    gui/KMessageWidget.h
-    gui/KMessageWidget.cpp
-    gui/MainWindowAdaptor.h
-    gui/MainWindowAdaptor.cpp
-    sshagent/bcrypt_pbkdf.cpp
-    sshagent/blf.h
-    sshagent/blowfish.c
-    tests/modeltest.cpp
-    tests/modeltest.h
-    # objective-c files
-    core/ScreenLockListenerMac.h
-    core/ScreenLockListenerMac.cpp
-)
+        # third-party files
+        streams/qtiocompressor.cpp
+        streams/qtiocompressor.h
+        gui/KMessageWidget.h
+        gui/KMessageWidget.cpp
+        gui/MainWindowAdaptor.h
+        gui/MainWindowAdaptor.cpp
+        sshagent/bcrypt_pbkdf.cpp
+        sshagent/blf.h
+        sshagent/blowfish.c
+        tests/modeltest.cpp
+        tests/modeltest.h
+        # objective-c files
+        core/ScreenLockListenerMac.h
+        core/ScreenLockListenerMac.cpp)
 
 file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h)
-foreach (SOURCE_FILE ${ALL_SOURCE_FILES})
-    foreach (EXCLUDED_DIR ${EXCLUDED_DIRS})
+foreach(SOURCE_FILE ${ALL_SOURCE_FILES})
+    foreach(EXCLUDED_DIR ${EXCLUDED_DIRS})
         string(FIND ${SOURCE_FILE} ${EXCLUDED_DIR} SOURCE_FILE_EXCLUDED)
-        if (NOT ${SOURCE_FILE_EXCLUDED} EQUAL -1)
+        if(NOT ${SOURCE_FILE_EXCLUDED} EQUAL -1)
             list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
-        endif ()
-    endforeach ()
-    foreach (EXCLUDED_FILE ${EXCLUDED_FILES})
-        if (${SOURCE_FILE} MATCHES ".*${EXCLUDED_FILE}$")
+        endif()
+    endforeach()
+    foreach(EXCLUDED_FILE ${EXCLUDED_FILES})
+        if(${SOURCE_FILE} MATCHES ".*${EXCLUDED_FILE}$")
             list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
-        endif ()
-    endforeach ()
-endforeach ()
+        endif()
+    endforeach()
+endforeach()
 
 add_custom_target(
         format