!156 libc-test的test_template.gni修改

Merge pull request !156 from caifuzhou/master

libc-test/test_template.gni

 import("//build/test.gni")
 
-build_out_dir = "out/ohos-arm-release"
 musl_dir = "third_party/musl/"
 test_dir = "${musl_dir}/libc-test"
-out_test_dir = "${build_out_dir}/obj/${musl_dir}/libc-test"
+out_test_dir = "${root_out_dir}/obj/${musl_dir}/libc-test"
+
+if (current_cpu == "arm") {
+  musl_arch = "arm"
+} else if (current_cpu == "arm64") {
+  musl_arch = "aarch64"
+}
 
 musl_include_dir =
-    "${build_out_dir}/obj/${musl_dir}/usr/include/arm-linux-ohosmusl"
-musl_lib_dir = "${build_out_dir}/obj/${musl_dir}/usr/lib/arm-linux-ohosmusl"
+    "${root_out_dir}/obj/${musl_dir}/usr/include/${musl_arch}-linux-ohosmusl"
+musl_lib_dir =
+    "${root_out_dir}/obj/${musl_dir}/usr/lib/${musl_arch}-linux-ohosmusl"
 
 test_lib_dir = "musl/libc-test/lib"
 
@@ -74,7 +80,7 @@ template("test_unittest") {
 
     if (target_dir == "functional") {
       cflags_c += [
-        # include/arm-linux-ohosmusl/endian.h:26:25: error: '&' within '|' [-Werror,-Wbitwise-op-parentheses]
+        # include/${musl_arch}-linux-ohosmusl/endian.h:26:25: error: '&' within '|' [-Werror,-Wbitwise-op-parentheses]
         "-Wno-error=bitwise-op-parentheses",
 
         #functional/sscanf.c:73:9: error: magnitude of floating-point constant too large for type 'double'; maximum is 1.7976931348623157E+308 [-Werror,-Wliteral-range]
@@ -88,15 +94,15 @@ template("test_unittest") {
 
       if (target_name == "dlopen") {
         ldflags += [ "-rdynamic" ]
-        libs += [ "//${build_out_dir}/${test_lib_dir}/libdlopen_dso.so" ]
+        #libs += [ "//${root_out_dir}/${test_lib_dir}/libdlopen_dso.so" ]
       }
 
       if (target_name == "tls_align" || target_name == "tls_align_dlopen") {
-        libs += [ "//${build_out_dir}/${test_lib_dir}/libtls_align_dso.so" ]
+        libs += [ "//${root_out_dir}/${test_lib_dir}/libtls_align_dso.so" ]
       }
 
       if (target_name == "tls_init" || target_name == "tls_init_dlopen") {
-        libs += [ "//${build_out_dir}/${test_lib_dir}/libtls_init_dso.so" ]
+        libs += [ "//${root_out_dir}/${test_lib_dir}/libtls_init_dso.so" ]
       }
     }
 
@@ -130,7 +136,7 @@ template("test_unittest") {
       if (target_name == "tls_get_new-dtv") {
         ldflags += [ "-Wl,-rpath='\$ORIGIN'" ]
         libs +=
-            [ "//${build_out_dir}/${test_lib_dir}/libtls_get_new-dtv_dso.so" ]
+            [ "//${root_out_dir}/${test_lib_dir}/libtls_get_new-dtv_dso.so" ]
       }
     }
   }