-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathohos_lab(1).patch
More file actions
63 lines (60 loc) · 3.53 KB
/
Copy pathohos_lab(1).patch
File metadata and controls
63 lines (60 loc) · 3.53 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
diff --git a/device/qemu/riscv32_virt/main.c b/device/qemu/riscv32_virt/main.c
index 2a261c5..63b5680 100755
--- a/device/qemu/riscv32_virt/main.c
+++ b/device/qemu/riscv32_virt/main.c
@@ -26,9 +26,9 @@ extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
-UINT32 LosAppInit(VOID){
+/*UINT32 LosAppInit(VOID){
return LOS_OK;
-}
+}*/
UINT32 QemuCLZ(UINT32 data)
{
diff --git a/kernel/liteos_m/BUILD.gn b/kernel/liteos_m/BUILD.gn
index aa5e3a7..5f694de 100644
--- a/kernel/liteos_m/BUILD.gn
+++ b/kernel/liteos_m/BUILD.gn
@@ -81,9 +81,9 @@ group("kernel") {
if (enable_ohos_kernel_liteos_m_shell) {
deps += [ "components/shell:shell" ]
}
- if (enable_ohos_kernel_liteos_m_test) {
- deps += [ "testsuits:test" ]
- }
+
+ deps += [ "testsuits:test" ]
+
if (enable_ohos_kernel_liteos_m_lwip) {
deps += [ ohos_kernel_liteos_m_lwip_path ]
}
diff --git a/kernel/liteos_m/testsuits/BUILD.gn b/kernel/liteos_m/testsuits/BUILD.gn
index d44a8b1..0fc9bfc 100644
--- a/kernel/liteos_m/testsuits/BUILD.gn
+++ b/kernel/liteos_m/testsuits/BUILD.gn
@@ -46,6 +46,10 @@ config("include") {
if (enable_ohos_kernel_liteos_m_test_full) {
defines += [ "LOS_KERNEL_TEST_FULL=1" ]
}
+ if (enable_ohos_kernel_liteos_m_test){
+ defines += [ "LK=1" ]
+ }
+
}
static_library("test_init") {
diff --git a/kernel/liteos_m/testsuits/src/osTest.c b/kernel/liteos_m/testsuits/src/osTest.c
index 2b442c0..36bf03d 100644
--- a/kernel/liteos_m/testsuits/src/osTest.c
+++ b/kernel/liteos_m/testsuits/src/osTest.c
@@ -202,7 +202,9 @@ UINT32 los_TestInit(VOID)
UINT32 LosAppInit()
{
UINT32 ret;
-
+#ifndef LK
+return LOS_OK;
+#endif
ret = los_TestInit();
if (ret != LOS_OK) {
return ret;