Move Toolchain to CommonLibrary

Signed-off-by: NFondMemoryVVV <mashuai53@huawei.com>

commonlibrary/BUILD.gn

@@ -15,6 +15,9 @@ import("//test/xts/tools/build/suite.gni")
 group("commonlibrary") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "ets_utils:ets_utils" ]
+    deps = [
+      "ets_utils:ets_utils",
+      "toolchain:toolchain",
+    ]
   }
 }

toolchain/BUILD.gn → commonlibrary/toolchain/BUILD.gn

@@ -18,7 +18,6 @@ group("toolchain") {
   deps = [ "//third_party/musl:libctest" ]
   if (is_standard_system) {
     deps += [
-      #":tar_testcases",
       ":tar_dllib",
     ]
   }
@@ -39,7 +38,7 @@ action("tar_testcases") {
   print("project_dirf-64:", project_dirf)
 
   test_path = string_replace(project_dirf, "/tar_files.py", "")
-  script = rebase_path("//test/xts/acts/toolchain/libc-test/tar_files.py")
+  script = rebase_path("//test/xts/acts/commonlibrary/toolchain/libc-test/tar_files.py")
 
   _outputs = [ "$target_out_dir/libc-test.tar" ]
   outputs = _outputs
@@ -70,7 +69,7 @@ action("tar_dllib") {
   print("project_dirf-64:", project_dirf)
 
   dllib_path = string_replace(project_dirf, "/tar_files.py", "")
-  script = rebase_path("//test/xts/acts/toolchain/libc-test/tar_files.py")
+  script = rebase_path("//test/xts/acts/commonlibrary/toolchain/libc-test/tar_files.py")
 
   _outputs = [ "$target_out_dir/libc-test-lib.tar" ]
   outputs = _outputs

toolchain/libc-test/include/setrlim.cpp → commonlibrary/toolchain/libc-test/include/setrlim.cpp

@@ -22,7 +22,7 @@ namespace OHOS {
 int runtest::t_setrlim(int r, long lim)
 {
     struct rlimit rl;
-
+    //Gets the current stack size
     if (getrlimit(r, &rl)) {
         printf("getrlimit %d: %s\n", r, strerror(errno));
         return -1;

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

@@ -41,20 +41,19 @@ static vector<std::string> temp = runtest::GetFileNames(filepath);
 
 volatile int t_status = 0;
 
-static int h_sigCount = 0;
 static void handler(int sig)
 {
-    (void)sig;
-    h_sigCount++;
 }
 
-static int start(char *wrap, const char *argvs)
+static int start(const char *argvs)
 {
     int pid, space_size = 100*1024;
-
+    //Create a child process
+    //Set the process stack space
     pid = fork();
     if (pid == 0) {
         runtest::t_setrlim(RLIMIT_STACK, space_size);
+        //Overloading the subprocess space
         int exe = execl(argvs, "strptime", nullptr);
         printf("exe:%d %s exec failed: %s\n", exe, argvs, strerror(errno));
         exit(1);
@@ -64,12 +63,11 @@ static int start(char *wrap, const char *argvs)
 
 static int runTests(const char *argvs)
 {
-    char wrap[] = "";
     int timeoutsec = 5, timeout = 0;
     int status, pid;
     sigset_t set;
     void (*retfunc)(int);
-
+    //signal set
     sigemptyset(&set);
     sigaddset(&set, SIGCHLD);
     sigprocmask(SIG_BLOCK, &set, nullptr);
@@ -77,16 +75,19 @@ static int runTests(const char *argvs)
     if (retfunc == SIG_ERR) {
         printf("signal triggering failed:%s\n", strerror(errno));
     }
-    pid = start(wrap, argvs);
+    pid = start(argvs);
+    //The function system call failed
     if (pid == -1) {
         printf("%s fork failed: %s\n", argvs, strerror(errno));
         printf("FAIL %s [internal]\n", argvs);
         return -1;
     }
     struct timespec tp;
+    //Maximum blocking time
     tp.tv_sec = timeoutsec;
     tp.tv_nsec = 0;
     if (sigtimedwait(&set, nullptr, &tp) == -1) {
+        //Call it again
         if (errno == EAGAIN) {
             timeout = 1;
         } else {
@@ -96,11 +97,13 @@ static int runTests(const char *argvs)
             printf("%s kill failed: %s\n", argvs, strerror(errno));
         }
     }
+    //Waiting for the process to stop
     if (waitpid(pid, &status, 0) != pid) {
         printf("%s waitpid failed: %s\n", argvs, strerror(errno));
         printf("FAIL %s [internal]\n", argvs);
         return -1;
     }
+    //Process state
     if (WIFEXITED(status)) {
         if (WEXITSTATUS(status) == 0) {
             return t_status;
@@ -120,7 +123,7 @@ static int runTests(const char *argvs)
 /**
  * @tc.name      : toolchaintest.LibcTest
  * @tc.desc      : start test
- * @tc.level     : Level 2
+ * @tc.level     : Level 3
  */
 HWTEST_P(toolchaintest, LibcTest, Function | MediumTest | Level3)
 {

toolchain/libc-test/tar_files.py → commonlibrary/toolchain/libc-test/tar_files.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-
-
 import os
 import argparse
 import tarfile

test_packages.gni

@@ -47,7 +47,6 @@ _all_test_packages = [
   "${ACTS_ROOT}/barrierfree:barrierfree",
   "${ACTS_ROOT}/customization:customization",
   "${ACTS_ROOT}/distributedschedule:systemabilitymgr",
-  "${ACTS_ROOT}/toolchain:toolchain",
 ]
 
 _all_test_packages_ivi = [