!5622 fix toolchain for master

Merge pull request !5622 from FondMemoryVVV/toolchain

commonlibrary/toolchain/BUILD.gn

@@ -14,17 +14,19 @@ import("//build/ohos_var.gni")
 import("//test/xts/tools/build/suite.gni")
 
 group("toolchain") {
-  testonly = true
-  deps = [ "//third_party/musl:libctest" ]
-  if (is_standard_system) {
-    deps += [ ":tar_dllib" ]
+  if (!(product_name == "m40")) {
+    testonly = true
+    deps = [ "//third_party/musl:libctest" ]
+    if (is_standard_system) {
+      deps += [ ":tar_dllib" ]
+    }
   }
 }
 
 action("tar_testcases") {
   testonly = true
   deps = [
-    "libc-test:ActToolChainTest",
+    "libc-test:ActsToolChainTest",
     "//third_party/musl:libctest",
   ]
   project_dir = rebase_path(".")
@@ -42,7 +44,7 @@ action("tar_testcases") {
   _outputs = [ "$target_out_dir/libc-test.tar" ]
   outputs = _outputs
 
-  input_path = rebase_path("$test_path/tests/unittest/libc-test")
+  input_path = rebase_path("$test_path/musl/libc-test")
   output_path = rebase_path("$test_path/suites/acts/testcases/libc-test.tar")
 
   print("root_build_dir-49", root_build_dir)

commonlibrary/toolchain/libc-test/BUILD.gn

@@ -27,7 +27,7 @@ config("module_private_config") {
 }
 
 ########################################################
-ohos_moduletest_suite("ActToolChainTest") {
+ohos_moduletest_suite("ActsToolChainTest") {
   configs = [ ":module_private_config" ]
   cflags_cc = [ "-DHILOG_ENABLE" ]
   defines = [ "_STANDARD_SYSTEM_" ]

commonlibrary/toolchain/libc-test/src/toolchaintest.cpp

@@ -36,7 +36,7 @@ using namespace testing;
 namespace OHOS {
 class toolchaintest : public ::testing::TestWithParam<string> {};
 
-static string filepath = "/data/local/tmp/libc-test/src";
+static string filepath = "/data/local/tmp/libc-test";
 static vector<std::string> temp = runtest::GetFileNames(filepath);
 
 volatile int t_status = 0;