Fix: Unittest build fix after f86d2ed

Author: coderarjob

include/bitmap.h

@@ -1,13 +1,12 @@
 /*
 * ---------------------------------------------------------------------------
-* Megha Operating System V2 - Common - Bitmap
+* Megha Operating System V2 - Cross Platform Kernel - Bitmap
 *
 * Bitmap implementation for use in the OS.
 * ---------------------------------------------------------------------------
 */
 
-#ifndef COMMON_BITMAP_H
-#define COMMON_BITMAP_H
+#pragma once
 
 #include <types.h>
 #include <utils.h>
@@ -34,4 +33,3 @@ BitmapState bitmap_get (Bitmap *b, UINT index);
 bool bitmap_setContinous (Bitmap *b, UINT index, UINT len, BitmapState state);
 INT bitmap_findContinous (Bitmap *b, BitmapState state, UINT len);
 bool bitmap_findContinousAt (Bitmap *b, BitmapState state, UINT len, UINT indexAt);
-#endif // COMMON_BITMAP_H

include/mock/common/bitmap.h renamed to include/mock/kernel/bitmap.h

@@ -2,7 +2,7 @@
 #define BITMAP_FAKE_H
 
 #include <unittest/fake.h>
-#include <common/bitmap.h>
+#include <bitmap.h>
 
 DECLARE_FUNC(BitmapState, bitmap_get, Bitmap *, UINT);
 DECLARE_FUNC(bool, bitmap_setContinous, Bitmap *, UINT, UINT, BitmapState);

include/mock/kernel/x86/pmm.h

@@ -1,7 +1,7 @@
 #ifndef PMM_FAKE_X86_H
 #define PMM_FAKE_X86_H
 
-#include <common/bitmap.h>
+#include <bitmap.h>
 #include <unittest/fake.h>
 #include <types.h>
 

src/mock/common/bitmap.c renamed to src/mock/kernel/bitmap.c

@@ -1,4 +1,4 @@
-#include <mock/common/bitmap.h>
+#include <mock/kernel/bitmap.h>
 #include <unittest/fake.h>
 
 DEFINE_FUNC(BitmapState, bitmap_get, Bitmap*, UINT);

src/unittests/CMakeLists.txt

@@ -35,7 +35,7 @@ test(
     NAME bitmap_test
     DEPENDENT_FOR build-all
     SOURCES
-        ${PROJECT_SOURCE_DIR}/src/common/bitmap.c
+        ${PROJECT_SOURCE_DIR}/src/kernel/bitmap.c
         ${CMAKE_CURRENT_SOURCE_DIR}/bitmap_test.c
         ${CMAKE_CURRENT_SOURCE_DIR}/unittest.c
         ${CMAKE_CURRENT_SOURCE_DIR}/common.c
@@ -78,7 +78,7 @@ test(
     DEPENDENT_FOR build-all
     SOURCES
         ${PROJECT_SOURCE_DIR}/src/kernel/pmm.c
-        ${PROJECT_SOURCE_DIR}/src/common/bitmap.c
+        ${PROJECT_SOURCE_DIR}/src/kernel/bitmap.c
         ${CMAKE_CURRENT_SOURCE_DIR}/pmm_test.c
         ${CMAKE_CURRENT_SOURCE_DIR}/common.c
         ${CMAKE_CURRENT_SOURCE_DIR}/unittest.c

src/unittests/bitmap_test.c

@@ -1,4 +1,4 @@
-#include <common/bitmap.h>
+#include <bitmap.h>
 #include <stdio.h>
 #include <string.h>
 #include <types.h>

src/unittests/x86/CMakeLists.txt

@@ -9,7 +9,7 @@ test(
         ${CMAKE_CURRENT_SOURCE_DIR}/../common.c
         # Mock sources
         ${PROJECT_SOURCE_DIR}/src/mock/kernel/kstdlib.c
-        ${PROJECT_SOURCE_DIR}/src/mock/common/bitmap.c
+        ${PROJECT_SOURCE_DIR}/src/mock/kernel/bitmap.c
         ${PROJECT_SOURCE_DIR}/src/mock/kernel/pmm.c
         ${PROJECT_SOURCE_DIR}/src/mock/kernel/x86/boot.c
     )