!887 Fix：修复文档链接失效问题

Merge pull request !887 from xuxinyu/3.2Beta1

kernel/base/BUILD.gn

@@ -90,13 +90,8 @@ kernel_module(module_name) {
   }
 
   public_configs = [ ":public" ]
-  configs += [ ":private" ]
 }
 
 config("public") {
   include_dirs = [ "include" ]
 }
-
-config("private") {
-  cflags = [ "-Wno-frame-address" ]
-}

kernel/base/Makefile

@@ -40,6 +40,6 @@ LOCAL_SRCS := 	$(wildcard ipc/*.c) $(wildcard core/*.c) $(wildcard mem/membox/*.
 		$(wildcard sched/*.c) \
 		$(wildcard vm/*.c)
 
-LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK) -Wno-frame-address
+LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK)
 
 include $(MODULE)

kernel/base/mp/los_lockdep.c

@@ -190,7 +190,11 @@ VOID OsLockDepCheckIn(SPIN_LOCK_S *lock)
 {
     UINT32 intSave;
     enum LockDepErrType checkResult = LOCKDEP_SUCCESS;
+#ifdef LOSCFG_COMPILER_CLANG_LLVM
     VOID *requestAddr = (VOID *)__builtin_return_address(1);
+#else
+    VOID *requestAddr = (VOID *)__builtin_return_address(0);
+#endif
     LosTaskCB *current = OsCurrTaskGet();
     LockDep *lockDep = &current->lockDep;
     LosTaskCB *lockOwner = NULL;
@@ -272,7 +276,11 @@ VOID OsLockDepCheckOut(SPIN_LOCK_S *lock)
     UINT32 intSave;
     INT32 depth;
     enum LockDepErrType checkResult = LOCKDEP_SUCCESS;
+#ifdef LOSCFG_COMPILER_CLANG_LLVM
     VOID *requestAddr = (VOID *)__builtin_return_address(1);
+#else
+    VOID *requestAddr = (VOID *)__builtin_return_address(0);
+#endif
     LosTaskCB *current = OsCurrTaskGet();
     LosTaskCB *owner = NULL;
     LockDep *lockDep = NULL;

lib/libc/musl/BUILD.gn

@@ -103,13 +103,13 @@ config("private") {
   if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
     cflags = [
       "-Wno-char-subscripts",
-      "-Wno-ignored-pragmas",
+      "-Wno-unknown-pragmas",
-      "-Wno-strict-prototypes",
     ]
   } else {
     cflags = [
       "-frounding-math",
       "-Wno-unused-but-set-variable",
+      "-Wno-unknown-pragmas",
     ]
   }
 
@@ -117,6 +117,5 @@ config("private") {
     "-Wno-shift-op-parentheses",
     "-Wno-logical-op-parentheses",
     "-Wno-bitwise-op-parentheses",
-    "-Wno-unknown-pragmas",
   ]
 }

lib/libc/musl/Makefile

@@ -59,10 +59,10 @@ LOCAL_INCLUDE += $(addprefix -I$(MUSLPORTINGDIR)/, src/include src/internal)
 
 LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LOCAL_CMACRO)
 ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
-LOCAL_FLAGS +=-Wno-char-subscripts -Wno-ignored-pragmas -Wno-strict-prototypes
+LOCAL_FLAGS +=-Wno-char-subscripts -Wno-unknown-pragmas
 else
-LOCAL_FLAGS += -frounding-math -Wno-unused-but-set-variable
+LOCAL_FLAGS += -frounding-math -Wno-unused-but-set-variable -Wno-unknown-pragmas
 endif
-LOCAL_FLAGS += -Wno-shift-op-parentheses -Wno-logical-op-parentheses -Wno-bitwise-op-parentheses -Wno-unknown-pragmas
+LOCAL_FLAGS += -Wno-shift-op-parentheses -Wno-logical-op-parentheses -Wno-bitwise-op-parentheses
 
 include $(MODULE)

testsuites/kernel/src/osTest.c

@@ -454,7 +454,7 @@ VOID TestTaskEntry(VOID)
 #if (TEST_MODULE_CHECK == 1)
         for (int i = 0; i < g_modelNum - 1; i++) {
             if (g_executModelNum[i] != 0) {
-                dprintf("\nExecuted Model: %s, Executed Model_Num: %d ,failed_count: %d , success_count :%d",
+                dprintf("\nExecuted Model: %s, Executed Model_Num: %d ,failed_count: %d , sucess_count :%d",
                     g_strModule[i], g_executModelNum[i], g_failModelResult[i], g_passModelResult[i]);
             }
             for (int j = 0; j < g_failResult && j < 50; j++) { // 50

testsuites/unittest/extended/signal/full/signal_test_029.cpp

@@ -35,7 +35,7 @@ static int g_sigCount = 0;
 static void SigPrint(int signum)
 {
     g_sigCount++;
-    printf("signal receive success\n");
+    printf("signal receive sucess\n");
 }
 
 static UINT32 TestCase(VOID)
@@ -101,7 +101,7 @@ static UINT32 TestCase(VOID)
     sleep(1);
     ret = kill(pid, SIGUSR1);
     ICUNIT_ASSERT_EQUAL(ret, 0, ret);
-    printf("kill success\n");
+    printf("kill sucess\n");
     ret = waitpid(pid, &status, 0);
     ICUNIT_ASSERT_EQUAL(ret, pid, ret);
     ICUNIT_ASSERT_EQUAL(WEXITSTATUS(status), LOS_OK, WEXITSTATUS(status));

testsuites/unittest/extended/signal/full/signal_test_030.cpp

@@ -35,7 +35,7 @@ static int g_sigCount = 0;
 static void SigPrint(int sig)
 {
     g_sigCount++;
-    printf("signal receive success\n");
+    printf("signal receive sucess\n");
 }
 
 static UINT32 TestCase(VOID)
@@ -68,7 +68,7 @@ static UINT32 TestCase(VOID)
     sleep(1);
     ret = kill(pid, SIGUSR1);
     ICUNIT_ASSERT_EQUAL(ret, 0, ret);
-    printf("kill success\n");
+    printf("kill sucess\n");
     wait(&ret);
     ICUNIT_ASSERT_EQUAL(WEXITSTATUS(ret), LOS_OK, WEXITSTATUS(ret));
     return LOS_OK;

testsuites/unittest/extended/signal/full/signal_test_033.cpp

@@ -36,13 +36,13 @@ static int g_sigCount1 = 0;
 static void SigPrint(int sig)
 {
     g_sigCount++;
-    printf("signal receive success\n");
+    printf("signal receive sucess\n");
 }
 
 static void SigPrint1(int sig)
 {
     g_sigCount1++;
-    printf("signal receive success\n");
+    printf("signal receive sucess\n");
 }
 
 static UINT32 TestCase(VOID)

testsuites/unittest/extended/signal/full/signal_test_040.cpp

@@ -37,7 +37,7 @@ static void SigPrint(int sig)
 {
     (void)sig;
     g_sigCount++;
-    printf("signal receive success\cn");
+    printf("signal receive sucess\n");
 }
 
 static UINT32 TestCase(VOID)

testsuites/unittest/extended/signal/smoke/signal_test_032.cpp

@@ -36,7 +36,7 @@ static void SigPrint(int sig)
 {
     (void)sig;
     g_sigCount++;
-    printf("signal receive success\n");
+    printf("signal receive sucess\n");
 }
 
 static UINT32 TestCase(VOID)

testsuites/unittest/libc/io/full/IO_test_dcgettext_001.cpp

@@ -32,36 +32,18 @@
 #include <libintl.h>
 #include <locale.h>
 
-const int domain_name_length = 10;
-const int buffer_size = 50;
-
 static UINT32 testcase(VOID)
 {
     char *s = "";
-    char domain[buffer_size], tmp[domain_name_length];
-    srand(time(NULL));
-    for (int i = 0, r = 0; i < domain_name_length; i++) {
-        r = rand() % 36; // 36: 0-9 and a-z
-        if (r < 10) {    // 10: 0-9
-            tmp[i] = '0' + r;
-        } else {
-            tmp[i] = 'a' + r;
-        }
-    }
-    int ret = sprintf_s(domain, sizeof(domain), "www.%s.com", tmp);
-    if (ret == 0) {
-        printf("sprinf_s failed\n");
-        return LOS_NOK;
-    }
 
     setlocale(LC_ALL, "");
     textdomain("gettext_demo");
     bindtextdomain("gettext_demo", ".");
     bind_textdomain_codeset("gettext_demo", "UTF-8");
 
-    printf(dcgettext(domain, "TestString1\n", LC_MESSAGES));
+    printf(dcgettext("www.huawei.com", "TestString1\n", LC_MESSAGES));
 
-    s = dcgettext(domain, "TestString1\n", LC_MESSAGES);
+    s = dcgettext("www.huawei.com", "TestString1\n", LC_MESSAGES);
     printf("[INFO]%s:%d,%s,s=%s\n", __FILE__, __LINE__, __func__, s);
     ICUNIT_ASSERT_STRING_EQUAL(s, "TestString1\n", s);
     setlocale(LC_ALL, "C");

testsuites/unittest/libc/sys/smoke/sys_test_017.cpp

@@ -30,7 +30,7 @@
  */
 #include "It_test_sys.h"
 
-const int password_length = 10;
+#define TEST_PASSWORD (char *)"test1234"
 
 static UINT32 TestCase(VOID)
 {
@@ -39,24 +39,14 @@ static UINT32 TestCase(VOID)
     char *key = NULL;
     char slat[2];
     int ret;
-    char test_password[password_length];
-    srand(time(NULL));
-    for (int i = 0, r = 0; i < password_length; i++) {
-        r = rand() % 36; // 36: 0-9 and a-z
-        if (r < 10) {    // 10: 0-9
-            test_password[i] = '0' + r;
-        } else {
-            test_password[i] = 'a' + r;
-        }
-    }
 
-    key = test_password;
+    key = TEST_PASSWORD;
     slat[0] = key[0];
     slat[1] = key[1];
     passwd1 = crypt(key, slat);
     ICUNIT_GOTO_NOT_EQUAL(passwd1, NULL, passwd1, EXIT);
 
-    key = test_password;
+    key = TEST_PASSWORD;
     slat[0] = passwd1[0];
     slat[1] = passwd1[1];
     passwd2 = crypt(key, slat);

testsuites/unittest/net/resolv/smoke/net_resolv_test_002.cpp

@@ -32,31 +32,21 @@
 
 #include <lt_net_resolv.h>
 
-const int buffer_size = 20;
-
 static int EtherAtonTest(void)
 {
     struct ether_addr *eaddr = ether_aton("01::EF");
 
     ICUNIT_ASSERT_EQUAL(eaddr, NULL, -1);
 
-    char mac_addr[buffer_size], *tmp = mac_addr;
+    eaddr = ether_aton("2C:9D:1E:4A:41:55");
-    int r[ETH_ALEN];
-    srand(time(NULL));
-    for (int i = 0; i < ETH_ALEN; i++) {
-        r[i] = rand() % 0xff;
-    }
-    // 0, 1, 2, 3, 4, 5: 6 elements of mac address.
-    (void)sprintf_s(mac_addr, sizeof(mac_addr), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", r[0], r[1], r[2], r[3], r[4], r[5]);
-    eaddr = ether_aton(mac_addr);
     ICUNIT_ASSERT_NOT_EQUAL(eaddr, NULL, -1);
 
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[0], r[0], eaddr->ether_addr_octet[0]);
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[0], 0x2C, eaddr->ether_addr_octet[0]);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[1], r[1], eaddr->ether_addr_octet[1]);
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[1], 0x9D, eaddr->ether_addr_octet[1]);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[2], r[2], eaddr->ether_addr_octet[2]); // 2: compare r[2] with eaddr
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[2], 0x1E, eaddr->ether_addr_octet[2]);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[3], r[3], eaddr->ether_addr_octet[3]); // 3: compare r[3] with eaddr
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[3], 0x4A, eaddr->ether_addr_octet[3]);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[4], r[4], eaddr->ether_addr_octet[4]); // 4: compare r[4] with eaddr
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[4], 0x41, eaddr->ether_addr_octet[4]);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[5], r[5], eaddr->ether_addr_octet[5]); // 5: compare r[5] with eaddr
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[5], 0x55, eaddr->ether_addr_octet[5]);
 
     return ICUNIT_SUCCESS;
 }

testsuites/unittest/net/resolv/smoke/net_resolv_test_003.cpp

@@ -32,8 +32,6 @@
 
 #include <lt_net_resolv.h>
 
-const int buffer_size = 20;
-
 static int EtherAtonrTest(void)
 {
     struct ether_addr addr;
@@ -41,23 +39,15 @@ static int EtherAtonrTest(void)
 
     ICUNIT_ASSERT_EQUAL(eaddr, NULL, -1);
 
-    char mac_addr[buffer_size], *tmp = mac_addr;
+    eaddr = ether_aton_r("2c:9d:1e:4A:41:55", &addr);
-    int r[ETH_ALEN];
-    srand(time(NULL));
-    for (int i = 0; i < ETH_ALEN; i++) {
-        r[i] = rand() % 0xff;
-    }
-    // 0, 1, 2, 3, 4, 5: 6 elements of mac address.
-    (void)sprintf_s(mac_addr, sizeof(mac_addr), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", r[0], r[1], r[2], r[3], r[4], r[5]);
-    eaddr = ether_aton_r(mac_addr, &addr);
 
     ICUNIT_ASSERT_EQUAL(eaddr, &addr, -1);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[0], r[0], eaddr->ether_addr_octet[0]);
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[0], 0x2c, eaddr->ether_addr_octet[0]);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[1], r[1], eaddr->ether_addr_octet[1]);
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[1], 0x9d, eaddr->ether_addr_octet[1]);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[2], r[2], eaddr->ether_addr_octet[2]); // 2: compare r[2] with eaddr
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[2], 0x1e, eaddr->ether_addr_octet[2]);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[3], r[3], eaddr->ether_addr_octet[3]); // 3: compare r[3] with eaddr
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[3], 0x4a, eaddr->ether_addr_octet[3]);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[4], r[4], eaddr->ether_addr_octet[4]); // 4: compare r[4] with eaddr
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[4], 0x41, eaddr->ether_addr_octet[4]);
-    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[5], r[5], eaddr->ether_addr_octet[5]); // 5: compare r[5] with eaddr
+    ICUNIT_ASSERT_EQUAL(eaddr->ether_addr_octet[5], 0x55, eaddr->ether_addr_octet[5]);
 
     return ICUNIT_SUCCESS;
 }

testsuites/unittest/net/resolv/smoke/net_resolv_test_006.cpp

@@ -32,26 +32,13 @@
 
 #include <lt_net_resolv.h>
 
-const int buffer_size = 20;
-
 static int EtherNtoaTest(void)
 {
-    struct ether_addr addr, *eaddr = &addr;
+    struct ether_addr addr = {{11,12,13,14,15,16}}, *eaddr = &addr;
-    srand(time(NULL));
-    int r[ETH_ALEN];
-    for (int i = 0; i < ETH_ALEN; i++) {
-        r[i] = rand() % 16; // 16: 0x0-0xf
-        eaddr->ether_addr_octet[i] = r[i];
-    }
     char *buf = ether_ntoa(eaddr);
-    char str1[buffer_size], str2[buffer_size];
-    // 0, 1, 2, 3, 4, 5: 6 elements of mac address.
-    (void)sprintf_s(str1, sizeof(str1), "%x:%x:%x:%x:%x:%x", r[0], r[1], r[2], r[3], r[4], r[5]);
-    // 0, 1, 2, 3, 4, 5: 6 elements of mac address.
-    (void)sprintf_s(str2, sizeof(str2), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", r[0], r[1], r[2], r[3], r[4], r[5]);
 
     ICUNIT_ASSERT_NOT_EQUAL(buf, 0, -1);
-    ICUNIT_ASSERT_EQUAL((stricmp(str1, buf) == 0 || stricmp(str2, buf) == 0), 1, printf("%s\n", buf));
+    ICUNIT_ASSERT_EQUAL((stricmp("b:c:d:e:f:10", buf) == 0 || stricmp("0b:0c:0d:0e:0f:10", buf) == 0), 1, printf("%s\n", buf));
 
     return ICUNIT_SUCCESS;
 }

testsuites/unittest/net/resolv/smoke/net_resolv_test_007.cpp

@@ -31,27 +31,13 @@
 
 #include <lt_net_resolv.h>
 
-const int buffer_size = 20;
-
 static int EtherNtoarTest(void)
 {
-    struct ether_addr addr, *eaddr = &addr;
+    struct ether_addr addr = {{11,12,13,4,15,16}}, *eaddr = &addr;
-    srand(time(NULL));
-    int r[ETH_ALEN];
-    for (int i = 0; i < ETH_ALEN; i++) {
-        r[i] = rand() % 16; // 16: 0x0-0xf
-        eaddr->ether_addr_octet[i] = r[i];
-    }
     char buf[100], *p = ether_ntoa_r(eaddr, buf);
 
-    char str1[buffer_size], str2[buffer_size];
-    // 0, 1, 2, 3, 4, 5: 6 elements of mac address.
-    (void)sprintf_s(str1, sizeof(str1), "%x:%x:%x:%x:%x:%x", r[0], r[1], r[2], r[3], r[4], r[5]);
-    // 0, 1, 2, 3, 4, 5: 6 elements of mac address.
-    (void)sprintf_s(str2, sizeof(str2), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", r[0], r[1], r[2], r[3], r[4], r[5]);
-
     ICUNIT_ASSERT_EQUAL(p, buf, (intptr_t)p);
-    ICUNIT_ASSERT_EQUAL((stricmp(str1, buf) == 0 || stricmp(str2, buf) == 0), 1, printf("%s\n", p));
+    ICUNIT_ASSERT_EQUAL((stricmp("b:c:d:4:f:10", buf) == 0 || stricmp("0b:0c:0d:04:0f:10", buf) == 0), 1, printf("%s\n", p));
 
     return ICUNIT_SUCCESS;
 }