[EGD-4075] Use FATFS in the Linux builds (#843)

* [EGD-4075] Use FAT fs in the emulator

Add script for genrate base phone image

* [EGD-4075] Use FreeRTOS-FAT in emulator initial commit

* [EGD-4075] Thread local storage fix

Fixing thread local storage when running on the
Linux platform in the test mode

* [EGD-4075] Improve image generation

Improve image generation script on the linux platform

* [EGD-4075] Fix all test with FAT fs image

Fix all tests with fatfs image

* [EGD-4075] Fix calculator utility test

* [EGD-4075] Image dependencies fix

* Remove uneeded comments

* Missing headers in CR

* [EGD-4075] Fixed whitespaces

Co-authored-by: Lucjan Bryndza <[email protected]>

Author: Lucjan Bryndza

.gitmodules

@@ -54,7 +54,7 @@
 	path = module-utils/magic_enum
 	url = [email protected]:Neargye/magic_enum.git
 [submodule "module-vfs/board/cross/freeRTOS_FAT"]
-	path = module-vfs/board/cross/freeRTOS_FAT
+	path = module-vfs/board/freeRTOS_FAT
 	url = ../Lab-Project-FreeRTOS-FAT.git
 [submodule "module-utils/tinyexpr"]
 	path = module-utils/tinyexpr

CMakeLists.txt

@@ -204,6 +204,20 @@ set_source_files_properties(source/main.cpp PROPERTIES COMPILE_DEFINITIONS "${EN
 target_link_options(${PROJECT_NAME} PUBLIC ${TARGET_LINK_OPTIONS})
 
 if (${PROJECT_TARGET} STREQUAL "TARGET_Linux")
+
+	set(FAT_IMAGE ${CMAKE_PROJECT_NAME}.img)
+	add_custom_command(
+		OUTPUT ${FAT_IMAGE}
+		DEPENDS assets
+		COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/generate_fatfs_image.sh ${FAT_IMAGE} ${CMAKE_BINARY_DIR}
+		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		COMMENT "Generate ${FAT_IMAGE}"
+	)
+	add_custom_target(
+		${FAT_IMAGE}-target ALL
+		DEPENDS ${FAT_IMAGE}
+	)
+	add_dependencies(check ${FAT_IMAGE}-target)
     install(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION "./")
 endif()
 

generate_fatfs_image.sh

@@ -0,0 +1,60 @@
+#!/bin/bash -e
+# Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+# For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+usage() {
+cat << ==usage
+Usage: $(basename $0) [image_dir] [assets_root_dir]
+	image_dir Target disk image
+	asset_root_dir Asset root directory
+==usage
+}
+
+ASSETS_DIR="assets country-codes.db Luts.bin"
+
+TEST_ITEMS="testfiles"
+
+if [ $# -ne 2 ]; then
+	echo "Error! Invalid argument count"
+	usage
+	exit -1
+fi
+IMAGE_NAME=$(realpath $1)
+SRC_DATA=$(realpath $2)
+
+if [ ! -d "$SRC_DATA" ]; then
+	echo "Error! asset_root_dir is not a directory"
+	usage
+	exit -1
+fi
+
+truncate -s 16G $IMAGE_NAME
+sfdisk $IMAGE_NAME << ==sfdisk
+label: dos
+label-id: 0x09650eb4
+unit: sectors
+
+/dev/sda1 : start=        2048, size=    28522496, type=b, bootable
+/dev/sda2 : start=    28524544, size=     2097152, type=b
+==sfdisk
+
+PART1="$IMAGE_NAME@@1048576"
+PART2="$IMAGE_NAME@@14604566528"
+mformat -i "$PART1" -F -T 28522496 -v PUREOS
+mformat -i "$PART2" -F -T 2097152 -v RECOVER
+mmd -i "$PART1" ::/current
+cd "$SRC_DATA"
+for i in $ASSETS_DIR; do
+	mcopy -s -i "$PART1" $i ::/current/
+done
+mcopy -s -i "$PART1" user ::
+mcopy -s -i "$PART1" .boot.json ::
+mcopy -s -i "$PART1" .boot.json.crc32 ::
+
+# Testing parts of files
+for i in $TEST_ITEMS; do
+	mcopy -s -i "$PART1" $i ::/current
+done
+mcopy -s -i "$PART1" sys/updates ::
+
+cd -

module-apps/application-calculator/tests/CalculatorUtility_tests.cpp

@@ -9,6 +9,14 @@
 
 class vfs vfs;
 
+struct vfs_initializer
+{
+    vfs_initializer()
+    {
+        vfs.Init();
+    }
+} vfs_initializer;
+
 TEST_CASE("Calculator utilities")
 {
     auto calculator = Calculator();

module-audio/Audio/test/unittest_audio.cpp

@@ -19,18 +19,29 @@
 
 class vfs vfs;
 
+struct vfs_initializer
+{
+    vfs_initializer()
+    {
+        vfs.Init();
+    }
+} vfs_init;
+
 TEST_CASE("Test audio tags")
 {
-    std::vector<std::string> testExtensions = {"flac", "wav", "mp3"};
-    for (auto ext : testExtensions) {
-        auto dec = audio::decoder::Create(("testfiles/audio." + ext).c_str());
-        REQUIRE(dec);
-        auto tags = dec->fetchTags();
-        REQUIRE(tags);
-        REQUIRE(tags->title == ext + " Test track title");
-        REQUIRE(tags->artist == ext + " Test artist name");
-        REQUIRE(tags->album == ext + " Test album title");
-        REQUIRE(tags->year == "2020");
+    SECTION(" Encoder tests ")
+    {
+        std::vector<std::string> testExtensions = {"flac", "wav", "mp3"};
+        for (auto ext : testExtensions) {
+            auto dec = audio::decoder::Create(("testfiles/audio." + ext).c_str());
+            REQUIRE(dec);
+            auto tags = dec->fetchTags();
+            REQUIRE(tags);
+            REQUIRE(tags->title == ext + " Test track title");
+            REQUIRE(tags->artist == ext + " Test artist name");
+            REQUIRE(tags->album == ext + " Test album title");
+            REQUIRE(tags->year == "2020");
+        }
     }
 }
 

module-db/tests/unittest.cpp

@@ -18,6 +18,14 @@
 
 class vfs vfs;
 
+struct vfs_initializer
+{
+    vfs_initializer()
+    {
+        vfs.Init();
+    }
+} vfs_initializer;
+
 TEST_CASE("Create and destroy simple database")
 {
 

module-gui/test/test-catch-text/main.cpp

@@ -8,3 +8,11 @@
 
 class vfs vfs;       // needed for compilation, our vfs is global
 utils::i18 localize; // needed to load any keymap - these are stored in i18
+
+struct vfs_initializer
+{
+    vfs_initializer()
+    {
+        vfs.Init();
+    }
+} vfs_initializer;

module-gui/test/test-catch/test-gui.cpp

@@ -6,6 +6,7 @@
 #include "mock/InitializedFontManager.hpp"
 #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
 
+#include <vfs.hpp>
 #include <memory>
 #include <functional>
 #include <iostream>
@@ -25,14 +26,21 @@
 #include <module-gui/gui/widgets/Label.hpp>
 #include <module-gui/gui/widgets/BoxLayout.hpp>
 #include <module-gui/gui/widgets/Image.hpp>
-#include <vfs.hpp>
 
 #include <mock/TestWindow.hpp>
 
 using namespace std;
 
 class vfs vfs;
 
+struct vfs_initializer
+{
+    vfs_initializer()
+    {
+        vfs.Init();
+    }
+} vfs_init;
+
 TEST_CASE("Test BoundingBox intersect")
 {
     gui::BoundingBox result;

module-services/service-desktop/tests/unittest.cpp

@@ -19,11 +19,17 @@
 
 class vfs vfs;
 
+struct vfs_initializer
+{
+    vfs_initializer()
+    {
+        vfs.Init();
+    }
+} vfs_initializer;
+
 TEST_CASE("System Update Tests")
 {
-    ServiceDesktop serviceDesktop;
-    vfs.Init();
-    UpdatePureOS updateOS(&serviceDesktop);
+    UpdatePureOS updateOS(nullptr);
 
     updateos::UpdateError err = updateOS.prepareTempDirForUpdate();
     REQUIRE(err == updateos::UpdateError::NoError);
@@ -39,7 +45,6 @@ TEST_CASE("System Update Tests")
 
 TEST_CASE("Factory Reset Test")
 {
-    vfs.Init();
 
     std::string sysdir = purefs::dir::eMMC_disk;
     sysdir += "/factory-test/sys";

module-utils/board/linux/log.cpp

@@ -94,7 +94,8 @@ static void _log_Log(
     std::cout << loggerBuffer;
 }
 
-void log_Log(logger_level level, const char *file, int line, const char *function, const char *fmt, ...)
+__attribute__((weak)) void log_Log(
+    logger_level level, const char *file, int line, const char *function, const char *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);