diff --git a/commonlibrary/toolchain/BUILD.gn b/commonlibrary/toolchain/BUILD.gn index 48ca92f72bbf9821984ff1347003fb2f8bfb6d4b..a21c2e61a64d3e10859232e9fb89d179a2930524 100644 --- a/commonlibrary/toolchain/BUILD.gn +++ b/commonlibrary/toolchain/BUILD.gn @@ -44,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) diff --git a/commonlibrary/toolchain/libc-test/Test.json b/commonlibrary/toolchain/libc-test/Test.json index 25564a73bb5a7150af27ce36318e63c054f350fd..5230d4fae5199befc89b24755597669318b0c96f 100755 --- a/commonlibrary/toolchain/libc-test/Test.json +++ b/commonlibrary/toolchain/libc-test/Test.json @@ -24,140 +24,155 @@ "tar -xf /data/local/tmp/libc-test-lib.tar -C /data/local/tmp/", "chmod a+x -R /data/local/tmp/libc-test-lib", "chmod a+x -R /data/local/tmp/libc-test", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/misc/vsyslog", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/temp/mkstemps", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/temp/mkostemps", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/linux/syncfs", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/linux/sync_file_range", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/linux/tee", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/linux/sendfile ", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/linux/removexattr", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/linux/copy_file_range", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/linux/setxattr", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/linux/splice", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/mman/mremap", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/mman/mincore", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/mman/msync", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/dirent/rewinddir", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/dirent/scandir ", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/dirent/readdir_r", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/manual/termios/tcgetattr", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/manual/termios/tcsendbreak", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/manual/termios/tcgetsid", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/manual/termios/tcsetattr", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/manual/env/a_stack_chk_fail", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/manual/unistd/tcsetpgrp", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/manual/unistd/ttyname", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/manual/unistd/tcgetpgrp", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/manual/unistd/isatty", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/fcntl/posix_fallocate", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/fcntl/posix_fadvise", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/passwd/getgrnam_r", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/ipc/ftok", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/freopen", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/__fwritable", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/setbuffer", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/vfscanf", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/tmpfile", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/__fwriting", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/setbuf", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/getwc", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/ungetwc", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/setlinebuf", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/fputc", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/stdio/fputs", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/truncate", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/fchownat", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/fsync", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/linkat", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/lchown", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/faccessat", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/unlinkat", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/acct", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/exit", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/readlinkat", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/write", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/getpid", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/exittest02", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/unlink", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/readv", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/unistd/pread ", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/misc/syslog", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/misc/vsyslog", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/network/res_query", - "rm -rf /data/local/tmp/libc-test/src/functionalext/dlns/dlns_dlopen_test ", - "rm -rf /data/local/tmp/libc-test/src/functionalext/dlns/dlns_set_fun_test", - "rm -rf /data/local/tmp/libc-test/src/functionalext/dlns/dlns_inherit_test", - "rm -rf /data/local/tmp/libc-test/src/functionalext/dlns/dlns_dlsym_test", - "rm -rf /data/local/tmp/libc-test/src/functionalext/dlns/dlns_special_scene_test", - "rm -rf /data/local/tmp/libc-test/src/functionalext/dlns/dlns_separated_test", - "rm -rf /data/local/tmp/libc-test/src/functionalext/relro/dlopen_ext_relro_test", - "rm -rf /data/local/tmp/libc-test/src/functionalext/tgkill/tgkill", - "rm -rf /data/local/tmp/libc-test/src/functionalext/time/strptime", - "rm -rf /data/local/tmp/libc-test/src/functionalext/time/ctime", - "rm -rf /data/local/tmp/libc-test/src/functionalext/time/asctime", - "rm -rf /data/local/tmp/libc-test/src/functionalext/time/strftime_l", - "rm -rf /data/local/tmp/libc-test/src/functionalext/time/strftime", - "rm -rf /data/local/tmp/libc-test/src/functionalext/time/localtime_r", - "rm -rf /data/local/tmp/libc-test/src/functionalext/time/localtime", - "rm -rf /data/local/tmp/libc-test/src/functionalext/time/ctime_r", - "rm -rf /data/local/tmp/libc-test/src/functionalext/time/timegm", - "rm -rf /data/local/tmp/libc-test/src/functionalext/time/asctime_r", - "rm -rf /data/local/tmp/libc-test/src/functionalext/trace/trace_stresstest", - "rm -rf /data/local/tmp/libc-test/src/functionalext/ldso_randomization/ldso_randomization_test", - "rm -rf /data/local/tmp/libc-test/src/functionalext/ldso_randomization/ldso_randomization_manual", - "rm -rf /data/local/tmp/libc-test/src/functionalext/symver/dlsym", - "rm -rf /data/local/tmp/libc-test/src/functionalext/symver/dynlink", - "rm -rf /data/local/tmp/libc-test/src/functionalext/symver/reloc_symver", - "rm -rf /data/local/tmp/libc-test/src/functionalext/symver/dynlink_default", - "rm -rf /data/local/tmp/libc-test/src/functionalext/symver/dlvsym", - "rm -rf /data/local/tmp/libc-test/src/functional/sem_open", - "rm -rf /data/local/tmp/libc-test/src/functional/ipc_shm", - "rm -rf /data/local/tmp/libc-test/src/functional/tgkill", - "rm -rf /data/local/tmp/libc-test/src/functional/fcntl ", - "rm -rf /data/local/tmp/libc-test/src/functional/tls_init_dlopen", - "rm -rf /data/local/tmp/libc-test/src/functional/tls_align", - "rm -rf /data/local/tmp/libc-test/src/functional/dlopen_ns", - "rm -rf /data/local/tmp/libc-test/src/functional/tls_align_dlopen", - "rm -rf /data/local/tmp/libc-test/src/functional/utim", - "rm -rf /data/local/tmp/libc-test/src/functional/dlclose_reset", - "rm -rf /data/local/tmp/libc-test/src/functional/ipc_sem", - "rm -rf /data/local/tmp/libc-test/src/functional/ungetc", - "rm -rf /data/local/tmp/libc-test/src/functional/fscanf", - "rm -rf /data/local/tmp/libc-test/src/functional/pthread_cancel", - "rm -rf /data/local/tmp/libc-test/src/functional/tls_init", - "rm -rf /data/local/tmp/libc-test/src/functional/fdopen", - "rm -rf /data/local/tmp/libc-test/src/functional/fwscanf", - "rm -rf /data/local/tmp/libc-test/src/functional/dlopen", - "rm -rf /data/local/tmp/libc-test/src/functional/ipc_msg", - "rm -rf /data/local/tmp/libc-test/src/regression/ftello-unflushed-append", - "rm -rf /data/local/tmp/libc-test/src/regression/malloc-brk-fail", - "rm -rf /data/local/tmp/libc-test/src/regression/pthread_atfork-errno-clobber", - "rm -rf /data/local/tmp/libc-test/src/regression/fflush-exit", - "rm -rf /data/local/tmp/libc-test/src/regression/lseek-large", - "rm -rf /data/local/tmp/libc-test/src/regression/tls_get_new-dtv", - "rm -rf /data/local/tmp/libc-test/src/regression/flockfile-list", - "rm -rf /data/local/tmp/libc-test/src/math/rintf", - "rm -rf /data/local/tmp/libc-test/src/math/nearbyint", - "rm -rf /data/local/tmp/libc-test/src/math/fma", - "rm -rf /data/local/tmp/libc-test/src/math/fmal", - "rm -rf /data/local/tmp/libc-test/src/math/acoshl", - "rm -rf /data/local/tmp/libc-test/src/math/tgammal", - "rm -rf /data/local/tmp/libc-test/src/math/sqrtl", - "rm -rf /data/local/tmp/libc-test/src/math/erfcl", - "rm -rf /data/local/tmp/libc-test/src/math/rint", - "rm -rf /data/local/tmp/libc-test/src/math/lgammal", - "rm -rf /data/local/tmp/libc-test/src/math/nearbyintf", - "rm -rf /data/local/tmp/libc-test/src/math/fmaf", - "rm -rf /data/local/tmp/libc-test/src/math/sqrtf", - "rm -rf /data/local/tmp/libc-test/src/math/rintl", - "rm -rf /data/local/tmp/libc-test/src/math/sqrt", - "rm -rf /data/local/tmp/libc-test/src/math/nearbyintl", - "rm -rf /data/local/tmp/libc-test/src/math/fenv", - "rm -rf /data/local/tmp/libc-test/src/math/asinhl", - "rm -rf /data/local/tmp/libc-test/src/functionalext/info/fatal_message", - "rm -rf /data/local/tmp/libc-test/src/functional/utime", - "rm -rf /data/local/tmp/libc-test/src/functionalext/supplement/manual/network" + "rm -rf /data/local/tmp/libc-test/vsyslog", + "rm -rf /data/local/tmp/libc-test/mkstemps", + "rm -rf /data/local/tmp/libc-test/mkostemps", + "rm -rf /data/local/tmp/libc-test/syncfs", + "rm -rf /data/local/tmp/libc-test/sync_file_range", + "rm -rf /data/local/tmp/libc-test/tee", + "rm -rf /data/local/tmp/libc-test/sendfile", + "rm -rf /data/local/tmp/libc-test/removexattr", + "rm -rf /data/local/tmp/libc-test/copy_file_range", + "rm -rf /data/local/tmp/libc-test/setxattr", + "rm -rf /data/local/tmp/libc-test/splice", + "rm -rf /data/local/tmp/libc-test/mremap", + "rm -rf /data/local/tmp/libc-test/mincore", + "rm -rf /data/local/tmp/libc-test/msync", + "rm -rf /data/local/tmp/libc-test/rewinddir", + "rm -rf /data/local/tmp/libc-test/scandir", + "rm -rf /data/local/tmp/libc-test/readdir_r", + "rm -rf /data/local/tmp/libc-test/tcgetattr", + "rm -rf /data/local/tmp/libc-test/tcsendbreak", + "rm -rf /data/local/tmp/libc-test/tcgetsid", + "rm -rf /data/local/tmp/libc-test/tcsetattr", + "rm -rf /data/local/tmp/libc-test/a_stack_chk_fail", + "rm -rf /data/local/tmp/libc-test/tcsetpgrp", + "rm -rf /data/local/tmp/libc-test/ttyname", + "rm -rf /data/local/tmp/libc-test/tcgetpgrp", + "rm -rf /data/local/tmp/libc-test/isatty", + "rm -rf /data/local/tmp/libc-test/posix_fallocate", + "rm -rf /data/local/tmp/libc-test/posix_fadvise", + "rm -rf /data/local/tmp/libc-test/getgrnam_r", + "rm -rf /data/local/tmp/libc-test/ftok", + "rm -rf /data/local/tmp/libc-test/freopen", + "rm -rf /data/local/tmp/libc-test/__fwritable", + "rm -rf /data/local/tmp/libc-test/setbuffer", + "rm -rf /data/local/tmp/libc-test/vfscanf", + "rm -rf /data/local/tmp/libc-test/tmpfile", + "rm -rf /data/local/tmp/libc-test/__fwriting", + "rm -rf /data/local/tmp/libc-test/setbuf", + "rm -rf /data/local/tmp/libc-test/getwc", + "rm -rf /data/local/tmp/libc-test/ungetwc", + "rm -rf /data/local/tmp/libc-test/setlinebuf", + "rm -rf /data/local/tmp/libc-test/fputc", + "rm -rf /data/local/tmp/libc-test/fputs", + "rm -rf /data/local/tmp/libc-test/truncate", + "rm -rf /data/local/tmp/libc-test/fchownat", + "rm -rf /data/local/tmp/libc-test/fsync", + "rm -rf /data/local/tmp/libc-test/linkat", + "rm -rf /data/local/tmp/libc-test/lchown", + "rm -rf /data/local/tmp/libc-test/faccessat", + "rm -rf /data/local/tmp/libc-test/unlinkat", + "rm -rf /data/local/tmp/libc-test/acct", + "rm -rf /data/local/tmp/libc-test/exit", + "rm -rf /data/local/tmp/libc-test/readlinkat", + "rm -rf /data/local/tmp/libc-test/write", + "rm -rf /data/local/tmp/libc-test/getpid", + "rm -rf /data/local/tmp/libc-test/exittest02", + "rm -rf /data/local/tmp/libc-test/unlink", + "rm -rf /data/local/tmp/libc-test/readv", + "rm -rf /data/local/tmp/libc-test/pread", + "rm -rf /data/local/tmp/libc-test/syslog", + "rm -rf /data/local/tmp/libc-test/vsyslog", + "rm -rf /data/local/tmp/libc-test/res_query", + "rm -rf /data/local/tmp/libc-test/dlns_dlopen_test ", + "rm -rf /data/local/tmp/libc-test/dlns_set_fun_test", + "rm -rf /data/local/tmp/libc-test/dlns_inherit_test", + "rm -rf /data/local/tmp/libc-test/dlns_dlsym_test", + "rm -rf /data/local/tmp/libc-test/dlns_special_scene_test", + "rm -rf /data/local/tmp/libc-test/dlns_separated_test", + "rm -rf /data/local/tmp/libc-test/dlopen_ext_relro_test", + "rm -rf /data/local/tmp/libc-test/strptime_ext", + "rm -rf /data/local/tmp/libc-test/ctime", + "rm -rf /data/local/tmp/libc-test/asctime", + "rm -rf /data/local/tmp/libc-test/strftime_l", + "rm -rf /data/local/tmp/libc-test/strftime_ext", + "rm -rf /data/local/tmp/libc-test/localtime_r", + "rm -rf /data/local/tmp/libc-test/localtime", + "rm -rf /data/local/tmp/libc-test/ctime_r", + "rm -rf /data/local/tmp/libc-test/timegm", + "rm -rf /data/local/tmp/libc-test/asctime_r", + "rm -rf /data/local/tmp/libc-test/trace_stresstest", + "rm -rf /data/local/tmp/libc-test/ldso_randomization_test", + "rm -rf /data/local/tmp/libc-test/ldso_randomization_manual", + "rm -rf /data/local/tmp/libc-test/dlsym", + "rm -rf /data/local/tmp/libc-test/dynlink", + "rm -rf /data/local/tmp/libc-test/reloc_symver", + "rm -rf /data/local/tmp/libc-test/dynlink_default", + "rm -rf /data/local/tmp/libc-test/dlvsym", + "rm -rf /data/local/tmp/libc-test/sem_open", + "rm -rf /data/local/tmp/libc-test/ipc_shm", + "rm -rf /data/local/tmp/libc-test/tgkill", + "rm -rf /data/local/tmp/libc-test/fcntl", + "rm -rf /data/local/tmp/libc-test/tls_init_dlopen", + "rm -rf /data/local/tmp/libc-test/tls_align", + "rm -rf /data/local/tmp/libc-test/dlopen_ns", + "rm -rf /data/local/tmp/libc-test/tls_align_dlopen", + "rm -rf /data/local/tmp/libc-test/utim", + "rm -rf /data/local/tmp/libc-test/dlclose_reset", + "rm -rf /data/local/tmp/libc-test/ipc_sem", + "rm -rf /data/local/tmp/libc-test/ungetc", + "rm -rf /data/local/tmp/libc-test/fscanf", + "rm -rf /data/local/tmp/libc-test/pthread_cancel", + "rm -rf /data/local/tmp/libc-test/tls_init", + "rm -rf /data/local/tmp/libc-test/fdopen", + "rm -rf /data/local/tmp/libc-test/fwscanf", + "rm -rf /data/local/tmp/libc-test/dlopen", + "rm -rf /data/local/tmp/libc-test/ipc_msg", + "rm -rf /data/local/tmp/libc-test/ftello-unflushed-append", + "rm -rf /data/local/tmp/libc-test/malloc-brk-fail", + "rm -rf /data/local/tmp/libc-test/pthread_atfork-errno-clobber", + "rm -rf /data/local/tmp/libc-test/fflush-exit", + "rm -rf /data/local/tmp/libc-test/lseek-large", + "rm -rf /data/local/tmp/libc-test/tls_get_new-dtv", + "rm -rf /data/local/tmp/libc-test/flockfile-list", + "rm -rf /data/local/tmp/libc-test/rintf", + "rm -rf /data/local/tmp/libc-test/nearbyint", + "rm -rf /data/local/tmp/libc-test/fma", + "rm -rf /data/local/tmp/libc-test/fmal", + "rm -rf /data/local/tmp/libc-test/acoshl", + "rm -rf /data/local/tmp/libc-test/tgammal", + "rm -rf /data/local/tmp/libc-test/sqrtl", + "rm -rf /data/local/tmp/libc-test/erfcl", + "rm -rf /data/local/tmp/libc-test/rint", + "rm -rf /data/local/tmp/libc-test/lgammal", + "rm -rf /data/local/tmp/libc-test/nearbyintf", + "rm -rf /data/local/tmp/libc-test/fmaf", + "rm -rf /data/local/tmp/libc-test/sqrtf", + "rm -rf /data/local/tmp/libc-test/rintl", + "rm -rf /data/local/tmp/libc-test/sqrt", + "rm -rf /data/local/tmp/libc-test/nearbyintl", + "rm -rf /data/local/tmp/libc-test/fenv", + "rm -rf /data/local/tmp/libc-test/asinhl", + "rm -rf /data/local/tmp/libc-test/fatal_message", + "rm -rf /data/local/tmp/libc-test/utime", + "rm -rf /data/local/tmp/libc-test/network", + "rm -rf /data/local/tmp/libc-test/vfprintf", + "rm -rf /data/local/tmp/libc-test/gethostbyname2_r", + "rm -rf /data/local/tmp/libc-test/utimensat", + "rm -rf /data/local/tmp/libc-test/tgkill_ext", + "rm -rf /data/local/tmp/libc-test/getnetbyname", + "rm -rf /data/local/tmp/libc-test/getnetbyaddr", + "rm -rf /data/local/tmp/libc-test/getline", + "rm -rf /data/local/tmp/libc-test/setvbuf", + "rm -rf /data/local/tmp/libc-test/res_send", + "rm -rf /data/local/tmp/libc-test/fchmodat", + "rm -rf /data/local/tmp/libc-test/gethostbyaddr_r", + "rm -rf /data/local/tmp/libc-test/getnameinfo", + "rm -rf /data/local/tmp/libc-test/res_querydomain", + "rm -rf /data/local/tmp/libc-test/gethostbyname2", + "rm -rf /data/local/tmp/libc-test/gethostbyaddr", + "rm -rf /data/local/tmp/libc-test/gethostbyname_r" ], "cleanup-apps": true } diff --git a/commonlibrary/toolchain/libc-test/src/toolchaintest.cpp b/commonlibrary/toolchain/libc-test/src/toolchaintest.cpp index a88b6aa0b8ec8d866f954f6984e9d44cd311533b..cd82b3db719f37ec4aa90274a6ec298b144bc290 100644 --- a/commonlibrary/toolchain/libc-test/src/toolchaintest.cpp +++ b/commonlibrary/toolchain/libc-test/src/toolchaintest.cpp @@ -36,7 +36,7 @@ using namespace testing; namespace OHOS { class toolchaintest : public ::testing::TestWithParam {}; -static string filepath = "/data/local/tmp/libc-test/src"; +static string filepath = "/data/local/tmp/libc-test"; static vector temp = runtest::GetFileNames(filepath); volatile int t_status = 0;