summaryrefslogtreecommitdiff
path: root/cesar/mac/sar
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-02-15 17:44:42 +0100
committerNélio Laranjeiro2012-03-12 17:21:36 +0100
commitb791b4ac6286d7e06d6c628b6168787ff7e45f40 (patch)
tree65cc1a603b60a9196ad3f232d902d33d77c88682 /cesar/mac/sar
parent55686ea30a6a1c09052909ee0ad8767688fdc0e5 (diff)
cesar/mac/sar: renamed unit tests, refs #2981
- rename directory unit_test as utest - rename directory host as lib - rename directory ecos as host Unit test of the SAR does not use eCos anymore
Diffstat (limited to 'cesar/mac/sar')
-rw-r--r--cesar/mac/sar/src/thread.c4
-rw-r--r--cesar/mac/sar/test/unit_test/ecos/Makefile26
-rw-r--r--cesar/mac/sar/test/unit_test/host/Makefile10
-rw-r--r--cesar/mac/sar/test/utest/host/Config (renamed from cesar/mac/sar/test/unit_test/ecos/Config)0
-rw-r--r--cesar/mac/sar/test/utest/host/Makefile29
-rw-r--r--cesar/mac/sar/test/utest/host/doc/Makefile (renamed from cesar/mac/sar/test/unit_test/ecos/doc/Makefile)0
-rw-r--r--cesar/mac/sar/test/utest/host/doc/reassembly_complete.txt (renamed from cesar/mac/sar/test/unit_test/ecos/doc/reassembly_complete.txt)0
-rw-r--r--cesar/mac/sar/test/utest/host/override/ce/rx/Module (renamed from cesar/mac/sar/test/unit_test/ecos/override/ce/rx/Module)0
-rw-r--r--cesar/mac/sar/test/utest/host/override/ce/rx/rx.h (renamed from cesar/mac/sar/test/unit_test/ecos/override/ce/rx/rx.h)2
-rw-r--r--cesar/mac/sar/test/utest/host/override/ce/rx/src/rx.c (renamed from cesar/mac/sar/test/unit_test/ecos/override/ce/rx/src/rx.c)0
-rw-r--r--cesar/mac/sar/test/utest/host/override/mac/pbproc/inc/context.h (renamed from cesar/mac/sar/test/unit_test/ecos/override/mac/pbproc/inc/context.h)0
-rw-r--r--cesar/mac/sar/test/utest/host/src/activate.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/activate.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/bufmgr_stub.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/bufmgr_stub.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/src/ca_stub.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/ca_stub.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/crc_error.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/crc_error.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/src/detect_mf.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/detect_mf.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/expiration.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/expiration.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/get_associated_mfs.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/get_associated_mfs.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/src/mfs_cmd.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/mfs_cmd.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/src/mfs_create.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/mfs_create.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/mfs_ssn_resize.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/mfs_ssn_resize.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/src/misc.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/misc.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/src/pbproc_stub.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/pbproc_stub.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/reassembly.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/reassembly.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/reassembly_measurement.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/reassembly_measurement.c)3
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/sar.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar_call_back_ul.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/sar_call_back_ul.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar_pb_stats.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/sar_pb_stats.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar_pbproc_override.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/sar_pbproc_override.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar_pbproc_override_mfs.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/sar_pbproc_override_mfs.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar_pbproc_override_sar_tx_mfs_extract.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/sar_pbproc_override_sar_tx_mfs_extract.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar_remove_sta.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/sar_remove_sta.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/sar_tx_job_desc_create.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/sar_tx_job_desc_create.c)2
-rw-r--r--cesar/mac/sar/test/utest/host/src/segmentation.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/segmentation.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/src/stats.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/stats.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/src/tests.c (renamed from cesar/mac/sar/test/unit_test/ecos/src/tests.c)4
-rw-r--r--cesar/mac/sar/test/utest/host/tests.h (renamed from cesar/mac/sar/test/unit_test/ecos/tests.h)2
-rw-r--r--cesar/mac/sar/test/utest/lib/Makefile10
-rw-r--r--cesar/mac/sar/test/utest/lib/doc/Makefile (renamed from cesar/mac/sar/test/unit_test/host/doc/Makefile)0
-rw-r--r--cesar/mac/sar/test/utest/lib/doc/bridgedma_list.txt (renamed from cesar/mac/sar/test/unit_test/host/doc/bridgedma_list.txt)0
-rw-r--r--cesar/mac/sar/test/utest/lib/doc/lib_sar_mf.txt (renamed from cesar/mac/sar/test/unit_test/host/doc/lib_sar_mf.txt)0
-rw-r--r--cesar/mac/sar/test/utest/lib/src/lib_sar_mf.c (renamed from cesar/mac/sar/test/unit_test/host/src/lib_sar_mf.c)0
-rw-r--r--cesar/mac/sar/test/utest/lib/src/phy_stub.c (renamed from cesar/mac/sar/test/unit_test/host/src/phy_stub.c)0
43 files changed, 78 insertions, 78 deletions
diff --git a/cesar/mac/sar/src/thread.c b/cesar/mac/sar/src/thread.c
index 485eee1a09..46abe5da98 100644
--- a/cesar/mac/sar/src/thread.c
+++ b/cesar/mac/sar/src/thread.c
@@ -49,7 +49,6 @@ sar_thread_init (sar_t *sar)
{
sar_thread_t *ctx = &sar_thread_global;
ctx->sar = sar;
-#ifndef SAR_UNIT_TEST
/* Create the Thread for the SAR. */
cyg_thread_create (MAC_SAR_THREAD_PRIORITY,
&sar_thread_process,
@@ -59,15 +58,12 @@ sar_thread_init (sar_t *sar)
MAC_SAR_THREAD_STACK_SIZE,
&ctx->thread_handle, &ctx->thread);
cyg_thread_resume (ctx->thread_handle);
-#endif
}
void
sar_thread_uninit (void)
{
sar_thread_t *ctx = &sar_thread_global;
-#ifndef SAR_UNIT_TEST
cyg_thread_suspend (ctx->thread_handle);
cyg_thread_delete (ctx->thread_handle);
-#endif
}
diff --git a/cesar/mac/sar/test/unit_test/ecos/Makefile b/cesar/mac/sar/test/unit_test/ecos/Makefile
deleted file mode 100644
index b6d1547147..0000000000
--- a/cesar/mac/sar/test/unit_test/ecos/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-BASE = ../../../../../
-
-INCLUDES = mac/sar/test/unit_test/ecos/override
-
-DEFS = -DNO_PRIVATE
-
-TARGET_PROGRAMS = sar sar_pbproc_override
-
-sar_SOURCES = sar.c activate.c mfs_ssn_resize.c \
- crc_error.c mfs_create.c mfs_cmd.c reassembly.c \
- reassembly_measurement.c expiration.c sar_call_back_ul.c \
- sar_remove_sta.c segmentation.c detect_mf.c \
- get_associated_mfs.c sar_tx_job_desc_create.c misc.c stats.c \
- sar_pb_stats.c ca_stub.c pbproc_stub.c tests.c bufmgr_stub.c
-sar_MODULES = lib mac/sar mac/common mac/pbproc hal/phy/soft/bridgedma \
- mac/sar/test/unit_test/ecos/override/ce/rx
-
-sar_pbproc_override_SOURCES = sar_pbproc_override.c \
- sar_pbproc_override_sar_tx_mfs_extract.c \
- sar_pbproc_override_mfs.c \
- ca_stub.c pbproc_stub.c tests.c bufmgr_stub.c
-sar_pbproc_override_MODULES = lib mac/sar mac/common hal/phy/soft/bridgedma \
- mac/sar/test/unit_test/ecos/override/ce/rx
-mac_pbproc_MODULE_SOURCES = mfs.c
-
-include $(BASE)/common/make/top.mk
diff --git a/cesar/mac/sar/test/unit_test/host/Makefile b/cesar/mac/sar/test/unit_test/host/Makefile
deleted file mode 100644
index 1eed775f22..0000000000
--- a/cesar/mac/sar/test/unit_test/host/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-BASE = ../../../../../
-
-HOST_PROGRAMS = lib_sar_mf
-
-lib_sar_mf_SOURCES = lib_sar_mf.c phy_stub.c
-lib_sar_mf_MODULES = lib mac/sar
-
-mac_sar_MODULE_SOURCES = sar_mf.c
-
-include $(BASE)/common/make/top.mk
diff --git a/cesar/mac/sar/test/unit_test/ecos/Config b/cesar/mac/sar/test/utest/host/Config
index 6c42e2ffc8..6c42e2ffc8 100644
--- a/cesar/mac/sar/test/unit_test/ecos/Config
+++ b/cesar/mac/sar/test/utest/host/Config
diff --git a/cesar/mac/sar/test/utest/host/Makefile b/cesar/mac/sar/test/utest/host/Makefile
new file mode 100644
index 0000000000..dc6fc66f85
--- /dev/null
+++ b/cesar/mac/sar/test/utest/host/Makefile
@@ -0,0 +1,29 @@
+BASE = ../../../../../
+
+INCLUDES = mac/sar/test/utest/host/override
+
+DEFS = -DNO_PRIVATE
+
+HOST_PROGRAMS = test_sar test_sar_pbproc_override
+
+test_sar_SOURCES = sar.c activate.c mfs_ssn_resize.c \
+ crc_error.c mfs_create.c mfs_cmd.c reassembly.c \
+ reassembly_measurement.c expiration.c sar_call_back_ul.c \
+ sar_remove_sta.c segmentation.c detect_mf.c \
+ get_associated_mfs.c sar_tx_job_desc_create.c misc.c \
+ stats.c sar_pb_stats.c ca_stub.c pbproc_stub.c tests.c \
+ bufmgr_stub.c
+test_sar_MODULES = lib mac/sar mac/common mac/pbproc hal/phy/soft/bridgedma \
+ mac/sar/test/utest/host/override/ce/rx
+
+test_sar_pbproc_override_SOURCES = sar_pbproc_override.c \
+ sar_pbproc_override_sar_tx_mfs_extract.c \
+ sar_pbproc_override_mfs.c \
+ ca_stub.c pbproc_stub.c tests.c \
+ bufmgr_stub.c
+test_sar_pbproc_override_MODULES = lib mac/sar mac/common \
+ hal/phy/soft/bridgedma \
+ mac/sar/test/utest/host/override/ce/rx
+mac_pbproc_MODULE_SOURCES = mfs.c
+
+include $(BASE)/common/make/top.mk
diff --git a/cesar/mac/sar/test/unit_test/ecos/doc/Makefile b/cesar/mac/sar/test/utest/host/doc/Makefile
index 0903abcc6b..0903abcc6b 100644
--- a/cesar/mac/sar/test/unit_test/ecos/doc/Makefile
+++ b/cesar/mac/sar/test/utest/host/doc/Makefile
diff --git a/cesar/mac/sar/test/unit_test/ecos/doc/reassembly_complete.txt b/cesar/mac/sar/test/utest/host/doc/reassembly_complete.txt
index b3b8fafc4c..b3b8fafc4c 100644
--- a/cesar/mac/sar/test/unit_test/ecos/doc/reassembly_complete.txt
+++ b/cesar/mac/sar/test/utest/host/doc/reassembly_complete.txt
diff --git a/cesar/mac/sar/test/unit_test/ecos/override/ce/rx/Module b/cesar/mac/sar/test/utest/host/override/ce/rx/Module
index 054b177f14..054b177f14 100644
--- a/cesar/mac/sar/test/unit_test/ecos/override/ce/rx/Module
+++ b/cesar/mac/sar/test/utest/host/override/ce/rx/Module
diff --git a/cesar/mac/sar/test/unit_test/ecos/override/ce/rx/rx.h b/cesar/mac/sar/test/utest/host/override/ce/rx/rx.h
index a3129b4274..2b57686731 100644
--- a/cesar/mac/sar/test/unit_test/ecos/override/ce/rx/rx.h
+++ b/cesar/mac/sar/test/utest/host/override/ce/rx/rx.h
@@ -8,7 +8,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/override/ce/rx/rx.h
+ * \file mac/sar/test/utest/host/override/ce/rx/rx.h
* \brief CE RX override functions.
* \ingroup mac_sar
*
diff --git a/cesar/mac/sar/test/unit_test/ecos/override/ce/rx/src/rx.c b/cesar/mac/sar/test/utest/host/override/ce/rx/src/rx.c
index b9bba3cdde..b9bba3cdde 100644
--- a/cesar/mac/sar/test/unit_test/ecos/override/ce/rx/src/rx.c
+++ b/cesar/mac/sar/test/utest/host/override/ce/rx/src/rx.c
diff --git a/cesar/mac/sar/test/unit_test/ecos/override/mac/pbproc/inc/context.h b/cesar/mac/sar/test/utest/host/override/mac/pbproc/inc/context.h
index b8cd914ef9..b8cd914ef9 100644
--- a/cesar/mac/sar/test/unit_test/ecos/override/mac/pbproc/inc/context.h
+++ b/cesar/mac/sar/test/utest/host/override/mac/pbproc/inc/context.h
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/activate.c b/cesar/mac/sar/test/utest/host/src/activate.c
index 91e190b1e6..409afde7ae 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/activate.c
+++ b/cesar/mac/sar/test/utest/host/src/activate.c
@@ -26,7 +26,7 @@
#include "hal/phy/bridgedma.h"
#include "hal/phy/soft/bridgedma/inc/bridgedma.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
#include <string.h>
sar_job_mfs_t *
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/bufmgr_stub.c b/cesar/mac/sar/test/utest/host/src/bufmgr_stub.c
index 031ea87b2d..51f5cad55c 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/bufmgr_stub.c
+++ b/cesar/mac/sar/test/utest/host/src/bufmgr_stub.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file unit_test/ecos/src/bufmgr_stub.c
+ * \file utest/host/src/bufmgr_stub.c
* \brief Buffer manager stub functions
* \ingroup mac_sar_test
*
@@ -18,7 +18,7 @@
#include "bufmgr/bufmgr.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
static u8 buffer[SAR_TEST_BUFFER_NB][ETH_PACKET_MAX_SIZE];
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/ca_stub.c b/cesar/mac/sar/test/utest/host/src/ca_stub.c
index 7ec1301ae4..d0d3bdd2e2 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/ca_stub.c
+++ b/cesar/mac/sar/test/utest/host/src/ca_stub.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file unit_test/ecos/src/ca_stub.c
+ * \file utest/host/src/ca_stub.c
* \brief « brief description »
* \ingroup « module »
*
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/crc_error.c b/cesar/mac/sar/test/utest/host/src/crc_error.c
index 02f215ff09..277bc503d3 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/crc_error.c
+++ b/cesar/mac/sar/test/utest/host/src/crc_error.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/crc_error.c
+ * \file mac/sar/test/utest/host/src/crc_error.c
* \brief test of the reassembly part
* \ingroup mac_sar
*
@@ -23,7 +23,7 @@
#include "ce/rx/rx.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
void
sar_rx_mpdu_process (sar_t *ctx, sar_mpdu_t * rx);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/detect_mf.c b/cesar/mac/sar/test/utest/host/src/detect_mf.c
index c5ad09052d..6325b90d7c 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/detect_mf.c
+++ b/cesar/mac/sar/test/utest/host/src/detect_mf.c
@@ -21,7 +21,7 @@
#include "mac/sar/inc/sar_job_mfs.h"
#include <string.h>
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
sar_job_mfs_t *
sar_rx_mfs_detect_and_reconstitute_mf (sar_t *ctx, mfs_rx_t *mfs);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/expiration.c b/cesar/mac/sar/test/utest/host/src/expiration.c
index 27548c5697..7fd452e5e9 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/expiration.c
+++ b/cesar/mac/sar/test/utest/host/src/expiration.c
@@ -17,7 +17,7 @@
#include "lib/stats.h"
#include "mac/common/ntb.h"
#include "mac/common/timings.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
#include <string.h>
/* Override context. */
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/get_associated_mfs.c b/cesar/mac/sar/test/utest/host/src/get_associated_mfs.c
index 29003f562a..a02229e93d 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/get_associated_mfs.c
+++ b/cesar/mac/sar/test/utest/host/src/get_associated_mfs.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/get_associated_mfs.c
+ * \file mac/sar/test/utest/host/src/get_associated_mfs.c
* \brief Test the get_associated_mfs of the reassembly process.
* \ingroup mac_sar
*
@@ -18,7 +18,7 @@
#include "mac/sar/sar.h"
#include "mac/sar/inc/sar_context.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
/* Function declared as inline in the source code. */
mfs_rx_t *
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/mfs_cmd.c b/cesar/mac/sar/test/utest/host/src/mfs_cmd.c
index 50e589d4a4..15f0b2e5a3 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/mfs_cmd.c
+++ b/cesar/mac/sar/test/utest/host/src/mfs_cmd.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/mfs_cmd.c
+ * \file mac/sar/test/utest/host/src/mfs_cmd.c
* \brief MFS cmd unit tests.
* \ingroup mac_sar
*
@@ -20,7 +20,7 @@
#include "mac/sar/sar.h"
#include "mac/sar/inc/sar_context.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
void
sar_rx_mfs_cmd_apply (sar_t *ctx, pbproc_rx_params_t *params);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/mfs_create.c b/cesar/mac/sar/test/utest/host/src/mfs_create.c
index 82983f9c30..53291201ba 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/mfs_create.c
+++ b/cesar/mac/sar/test/utest/host/src/mfs_create.c
@@ -32,7 +32,7 @@
#include "ce/rx/rx.h"
#include <string.h>
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
void test_without_mfs (test_t test, uint lid, bool mme, bool bcast)
{
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/mfs_ssn_resize.c b/cesar/mac/sar/test/utest/host/src/mfs_ssn_resize.c
index 4e3c55a78b..7b78fa85c1 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/mfs_ssn_resize.c
+++ b/cesar/mac/sar/test/utest/host/src/mfs_ssn_resize.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/mfs_ssn_resize.c
+ * \file mac/sar/test/utest/host/src/mfs_ssn_resize.c
* \brief rx_mfs_ssn_resize function test.
* \ingroup mac_sar
*/
@@ -21,7 +21,7 @@
#include "ce/rx/rx.h"
#include "mac/sar/inc/sar_context.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
void
sar_rx_mfs_resize_ssn (mfs_rx_t *mfs, pb_t *pb, uint pb_nb);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/misc.c b/cesar/mac/sar/test/utest/host/src/misc.c
index 9c1210b068..30a99360d3 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/misc.c
+++ b/cesar/mac/sar/test/utest/host/src/misc.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/misc.c
+ * \file mac/sar/test/utest/host/src/misc.c
* \brief Misc functions tests.
* \ingroup mac_sar
*/
@@ -15,7 +15,7 @@
#include "lib/blk.h"
#include "mac/sar/inc/sar_context.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
#include "config.h"
#include <string.h>
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/pbproc_stub.c b/cesar/mac/sar/test/utest/host/src/pbproc_stub.c
index e6e465f144..6d76d5c405 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/pbproc_stub.c
+++ b/cesar/mac/sar/test/utest/host/src/pbproc_stub.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file unit_test/ecos/src/pbproc_stub.c
+ * \file utest/host/src/pbproc_stub.c
* \brief « brief description »
* \ingroup « module »
*
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/reassembly.c b/cesar/mac/sar/test/utest/host/src/reassembly.c
index dc6d65b22c..6a4c7c6437 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/reassembly.c
+++ b/cesar/mac/sar/test/utest/host/src/reassembly.c
@@ -33,7 +33,7 @@
#include "ce/rx/rx.h"
#include <string.h>
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
#include <string.h>
#include "config/blk.h"
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/reassembly_measurement.c b/cesar/mac/sar/test/utest/host/src/reassembly_measurement.c
index 085e050578..4a9d9886fa 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/reassembly_measurement.c
+++ b/cesar/mac/sar/test/utest/host/src/reassembly_measurement.c
@@ -14,7 +14,8 @@
#include "lib/blk.h"
#include "lib/test.h"
#include "ce/rx/rx.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
+#include "mac/sar/inc/rx.h"
void
test_ce_measures (test_t test, sar_test_t *t, bool crc_error, bool encrypted)
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar.c b/cesar/mac/sar/test/utest/host/src/sar.c
index e18cfecca2..e2257a545a 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar.c
+++ b/cesar/mac/sar/test/utest/host/src/sar.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/sar.c
+ * \file mac/sar/test/utest/host/src/sar.c
* \brief Main file for unit tests.
* \ingroup mac_sar
*/
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_call_back_ul.c b/cesar/mac/sar/test/utest/host/src/sar_call_back_ul.c
index 78f0d07241..8aae5eda81 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_call_back_ul.c
+++ b/cesar/mac/sar/test/utest/host/src/sar_call_back_ul.c
@@ -23,7 +23,7 @@
#include "mac/sar/inc/sar_context.h"
#include "mac/sar/inc/sar.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
sar_job_mfs_t*
sar_job_mfs_create_rx (void);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_pb_stats.c b/cesar/mac/sar/test/utest/host/src/sar_pb_stats.c
index 418e12f359..9184049470 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_pb_stats.c
+++ b/cesar/mac/sar/test/utest/host/src/sar_pb_stats.c
@@ -6,14 +6,14 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/sar_pb_stats.c
+ * \file mac/sar/test/utest/host/src/sar_pb_stats.c
* \brief pb statistics per mpdu.
* \ingroup mac_sar_pbstats
*/
#include "common/std.h"
#include "lib/test.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
#include "mac/sar/sar.h"
#include "mac/sar/inc/sar.h"
#include "mac/sar/inc/rx.h"
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_pbproc_override.c b/cesar/mac/sar/test/utest/host/src/sar_pbproc_override.c
index 5f7cf1d3ea..3f12827a2e 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_pbproc_override.c
+++ b/cesar/mac/sar/test/utest/host/src/sar_pbproc_override.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/sar_pbproc_override.c
+ * \file mac/sar/test/utest/host/src/sar_pbproc_override.c
* \brief Test function which needs a full PBPROC override.
* \ingroup mac_sar
*
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_pbproc_override_mfs.c b/cesar/mac/sar/test/utest/host/src/sar_pbproc_override_mfs.c
index 9526d12bda..b89f4eac8d 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_pbproc_override_mfs.c
+++ b/cesar/mac/sar/test/utest/host/src/sar_pbproc_override_mfs.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/sar_pbproc_override_mfs.c
+ * \file mac/sar/test/utest/host/src/sar_pbproc_override_mfs.c
* \brief pbproc mfs functions.
* \ingroup mac_sar
*/
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_pbproc_override_sar_tx_mfs_extract.c b/cesar/mac/sar/test/utest/host/src/sar_pbproc_override_sar_tx_mfs_extract.c
index c1a7dcf3fc..32c99425a5 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_pbproc_override_sar_tx_mfs_extract.c
+++ b/cesar/mac/sar/test/utest/host/src/sar_pbproc_override_sar_tx_mfs_extract.c
@@ -6,14 +6,14 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/sar_pbproc_override_sar_tx_mfs_extract.c
+ * \file mac/sar/test/utest/host/src/sar_pbproc_override_sar_tx_mfs_extract.c
* \brief Function to test the extraction of PBs.
* \ingroup mac_sar
*
*/
#include "common/std.h"
#include "lib/test.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
void
sar_tx_mac_framing (sar_t *ctx, sar_msdu_t *md_data);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_remove_sta.c b/cesar/mac/sar/test/utest/host/src/sar_remove_sta.c
index 8e31758932..dde515502a 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_remove_sta.c
+++ b/cesar/mac/sar/test/utest/host/src/sar_remove_sta.c
@@ -21,7 +21,7 @@
#include "mac/sar/inc/sar_context.h"
#include "mac/sar/inc/sar_expiration.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
void
test_case_sar_sta_remove__station_without_mfs (test_t test)
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/sar_tx_job_desc_create.c b/cesar/mac/sar/test/utest/host/src/sar_tx_job_desc_create.c
index 131274210a..97c32e6c7e 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/sar_tx_job_desc_create.c
+++ b/cesar/mac/sar/test/utest/host/src/sar_tx_job_desc_create.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file cesar/mac/sar/test/unit_test/ecos/src/sar_tx_job_desc_create.c
+ * \file cesar/mac/sar/test/utest/host/src/sar_tx_job_desc_create.c
* \brief Test the sar_tx_job_desc_create function.
* \ingroup mac_sar
*
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/segmentation.c b/cesar/mac/sar/test/utest/host/src/segmentation.c
index 689c8b8f3a..0269201ac5 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/segmentation.c
+++ b/cesar/mac/sar/test/utest/host/src/segmentation.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/segmentation.c
+ * \file mac/sar/test/utest/host/src/segmentation.c
* \brief Test segmentation cases.
* \ingroup mac_sar
*
@@ -28,7 +28,7 @@
/* Override context. */
#include "mac/pbproc/inc/context.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
void
sar_tx_mac_framing (sar_t *ctx, sar_msdu_t *md_data);
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/stats.c b/cesar/mac/sar/test/utest/host/src/stats.c
index edc1626fe5..910be40b20 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/stats.c
+++ b/cesar/mac/sar/test/utest/host/src/stats.c
@@ -6,14 +6,14 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/stats.c
+ * \file mac/sar/test/utest/host/src/stats.c
* \brief Test statistics.
* \ingroup mac_sar
*/
#include "common/std.h"
#include "lib/test.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
#include <string.h>
#include <stdio.h>
diff --git a/cesar/mac/sar/test/unit_test/ecos/src/tests.c b/cesar/mac/sar/test/utest/host/src/tests.c
index e9a6793859..803c397c6b 100644
--- a/cesar/mac/sar/test/unit_test/ecos/src/tests.c
+++ b/cesar/mac/sar/test/utest/host/src/tests.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/src/tests.c
+ * \file mac/sar/test/utest/host/src/tests.c
* \brief Library for the unit tests.
* \ingroup mac_sar
*
@@ -20,7 +20,7 @@
#include "bufmgr/bufmgr.h"
#include "mac/common/ntb.h"
#include "mac/sar/inc/sar_context.h"
-#include "mac/sar/test/unit_test/ecos/tests.h"
+#include "mac/sar/test/utest/host/tests.h"
/* Override interfaces. */
#include "ce/rx/rx.h"
diff --git a/cesar/mac/sar/test/unit_test/ecos/tests.h b/cesar/mac/sar/test/utest/host/tests.h
index 436c994599..35a56bde59 100644
--- a/cesar/mac/sar/test/unit_test/ecos/tests.h
+++ b/cesar/mac/sar/test/utest/host/tests.h
@@ -8,7 +8,7 @@
*
* }}} */
/**
- * \file mac/sar/test/unit_test/ecos/tests.h
+ * \file mac/sar/test/utest/host/tests.h
* \brief Library tests
* \ingroup mac_sar
*/
diff --git a/cesar/mac/sar/test/utest/lib/Makefile b/cesar/mac/sar/test/utest/lib/Makefile
new file mode 100644
index 0000000000..bd5d54f329
--- /dev/null
+++ b/cesar/mac/sar/test/utest/lib/Makefile
@@ -0,0 +1,10 @@
+BASE = ../../../../../
+
+HOST_PROGRAMS = test_lib_sar_mf
+
+test_lib_sar_mf_SOURCES = lib_sar_mf.c phy_stub.c
+test_lib_sar_mf_MODULES = lib mac/sar
+
+mac_sar_MODULE_SOURCES = sar_mf.c
+
+include $(BASE)/common/make/top.mk
diff --git a/cesar/mac/sar/test/unit_test/host/doc/Makefile b/cesar/mac/sar/test/utest/lib/doc/Makefile
index f96e52c679..f96e52c679 100644
--- a/cesar/mac/sar/test/unit_test/host/doc/Makefile
+++ b/cesar/mac/sar/test/utest/lib/doc/Makefile
diff --git a/cesar/mac/sar/test/unit_test/host/doc/bridgedma_list.txt b/cesar/mac/sar/test/utest/lib/doc/bridgedma_list.txt
index 154169eccf..154169eccf 100644
--- a/cesar/mac/sar/test/unit_test/host/doc/bridgedma_list.txt
+++ b/cesar/mac/sar/test/utest/lib/doc/bridgedma_list.txt
diff --git a/cesar/mac/sar/test/unit_test/host/doc/lib_sar_mf.txt b/cesar/mac/sar/test/utest/lib/doc/lib_sar_mf.txt
index 2bc4a80250..2bc4a80250 100644
--- a/cesar/mac/sar/test/unit_test/host/doc/lib_sar_mf.txt
+++ b/cesar/mac/sar/test/utest/lib/doc/lib_sar_mf.txt
diff --git a/cesar/mac/sar/test/unit_test/host/src/lib_sar_mf.c b/cesar/mac/sar/test/utest/lib/src/lib_sar_mf.c
index 8273cc535b..8273cc535b 100644
--- a/cesar/mac/sar/test/unit_test/host/src/lib_sar_mf.c
+++ b/cesar/mac/sar/test/utest/lib/src/lib_sar_mf.c
diff --git a/cesar/mac/sar/test/unit_test/host/src/phy_stub.c b/cesar/mac/sar/test/utest/lib/src/phy_stub.c
index a4cd3d773e..a4cd3d773e 100644
--- a/cesar/mac/sar/test/unit_test/host/src/phy_stub.c
+++ b/cesar/mac/sar/test/utest/lib/src/phy_stub.c