diff --git a/liteos.gni b/liteos.gni index 4a10574dc41a7e6d5516b6e71f24a6b91657e1e5..4a219c89104f2ad3a9280aaef23224e75e31fcf3 100644 --- a/liteos.gni +++ b/liteos.gni @@ -33,6 +33,10 @@ LITEOS_MENUCONFIG_H = rebase_path("$root_out_dir/config.h") liteos_config_file = "${ohos_build_type}.config" +if (board_toolchain_type == "clang") { + liteos_config_file = "clang-${liteos_config_file}" +} + liteos_config_file = rebase_path(liteos_config_file, "", "$product_path/kernel_configs") print("liteos_config_file:", liteos_config_file) @@ -163,8 +167,8 @@ set_defaults("kernel_module") { "$LITEOSTOPDIR:los_config", ] visibility = [ - "$LITEOSTOPDIR:*", ":*", + "$LITEOSTOPDIR:*", "..:*", "../..:*", ] diff --git a/testsuites/unittest/posix/src/fs/api/posix_fs_opendir_test.c b/testsuites/unittest/posix/src/fs/api/posix_fs_opendir_test.c index 78cd71fa1873ab6e2feea8874a4811d3fcce891f..29522a81b5503ac2bc5b48aa083cfe205609e8db 100644 --- a/testsuites/unittest/posix/src/fs/api/posix_fs_opendir_test.c +++ b/testsuites/unittest/posix/src/fs/api/posix_fs_opendir_test.c @@ -40,7 +40,7 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, TestFsOpendirOK, Function | MediumTest | Le int32_t ret; DIR *dir = opendir(TEST_ROOT); - ICUNIT_ASSERT_NOT_EQUAL_VOID(dir, NULL, dir); + ICUNIT_ASSERT_NOT_EQUAL(dir, NULL, dir); ret = closedir(dir); ICUNIT_ASSERT_NOT_EQUAL(ret, POSIX_FS_IS_ERROR, ret); @@ -57,7 +57,7 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, TestFsOpendirEINVAL, Function | MediumTest { DIR *dir = opendir(NULL); ICUNIT_ASSERT_EQUAL(errno, EINVAL, POSIX_FS_IS_ERROR); - ICUNIT_ASSERT_EQUAL_VOID(dir, NULL, dir); + ICUNIT_ASSERT_EQUAL(dir, NULL, dir); return POSIX_FS_NO_ERROR; } @@ -76,8 +76,7 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, TestFsOpendirENOENT, Function | MediumTest dir = opendir(TEST_ROOT); g_mountPoints = mountBak; ICUNIT_ASSERT_EQUAL(errno, ENOENT, POSIX_FS_IS_ERROR); - ICUNIT_ASSERT_EQUAL_VOID(dir, NULL, dir); - + ICUNIT_ASSERT_EQUAL(dir, NULL, dir); return POSIX_FS_NO_ERROR; }