3 files changed, 7 insertions(+), 2 deletions(-)

M generate_fatfs_image.sh
M module-gui/test/mock/InitializedFontManager.cpp
M module-gui/test/test-catch-text/CMakeLists.txt

@@ 67,6 67,7 @@ mformat -i "$PART2" -F -T 2097152 -v RECOVER
 mmd -i "$PART1" ::/current
 cd "$SRC_DATA"
 for i in $ASSETS_DIR; do
+    echo "copy: $i"
 	mcopy -s -i "$PART1" $i ::/current/
 done
 mcopy -s -i "$PART1" user ::

@@ 1,8 1,11 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "InitializedFontManager.hpp"
 #include <mutex>
+#include <vfs.hpp>
+
+extern class vfs vfs;
 
 namespace mockup
 {


@@ 10,6 13,7 @@ namespace mockup
 
     auto fontManager() -> gui::FontManager &
     {
+        vfs.Init();
         std::lock_guard<std::mutex> scoped(guard);
         auto &fontmanager = gui::FontManager::getInstance();
         if (!fontmanager.isInitialized()) {

@@ 19,9 19,9 @@ add_catch2_executable(
                 ..
                 ../mock/
         LIBS
+                module-vfs
                 module-gui
                 iosyscalls
-                module-vfs
         DEPS
                 assets
                 PurePhone.img-target