!312 【轻内核】【master】ltp适配liteos_a上arch_cflags

Merge pull request !312 from chuaizhzh/ltp_202107081109

open_posix_testsuite/conformance/definitions/BUILD.gn

@@ -18,7 +18,8 @@ open_source_suite("ActsOpenPosixBuildOnlyTest") {
   exec_command_path = "//third_party/ltp/testcases/open_posix_testsuite/"
   compiler = rebase_path("${ohos_build_compiler_dir}/bin/${ohos_build_compiler}")
   sysroot_path = rebase_path(ohos_current_sysroot)
-  prebuild_command = "make clean && make distclean && ./scripts/generate-makefiles.sh $compiler ${ohos_root_path} ${sysroot_path} && make -j -C conformance/definitions"
+  arch_cflags = string_join(" ", target_arch_cflags)
+  prebuild_command = "make clean && make distclean && ./scripts/generate-makefiles.sh $compiler ${ohos_root_path} ${sysroot_path} \"${arch_cflags}\" && make -j -C conformance/definitions"
   exec_sub_dir = "conformance/definitions"
   build_args = [
     "signal_h/logfile",

open_posix_testsuite/conformance/interfaces/BUILD.gn

@@ -18,7 +18,8 @@ open_source_suite("ActsOpenPosixTest") {
   suite_name = "acts"
   exec_command_path = "//third_party/ltp/testcases/open_posix_testsuite/"
   sysroot_path = rebase_path(ohos_current_sysroot)
-  prebuild_command = "make clean && make distclean && ./scripts/generate-makefiles.sh $compiler ${ohos_root_path} ${sysroot_path} && make -j -C conformance/interfaces"
+  arch_cflags = string_join(" ", target_arch_cflags)
+  prebuild_command = "make clean && make distclean && ./scripts/generate-makefiles.sh $compiler ${ohos_root_path} ${sysroot_path} \"${arch_cflags}\" && make -j -C conformance/interfaces"
   exec_sub_dir = "conformance/interfaces"
   deps = [
     "//test/xts/acts/open_posix_testsuite/conformance/definitions:ActsOpenPosixBuildOnlyTest",

open_posix_testsuite/ltp-patch/generate-makefiles.sh.patch

---- third_party/ltp/testcases/open_posix_testsuite/scripts/generate-makefiles.sh	2021-07-03 15:38:26.370000000 +0800
-+++ test/xts/acts/open_posix_testsuite/ltp-patch/generate-makefiles.sh	2021-07-03 15:28:41.940000000 +0800
+--- third_party/ltp/testcases/open_posix_testsuite/scripts/generate-makefiles.sh	2021-07-08 10:43:20.237148000 +0800
++++ test/xts/acts/open_posix_testsuite/ltp-patch/generate-makefiles.sh	2021-07-08 10:38:59.237148000 +0800
 @@ -107,6 +107,7 @@
  #
  
@@ -12,17 +12,18 @@
  
  # Build variables
  CFLAGS+=		-I\$(top_srcdir)/include
-+CFLAGS+=        --target=arm-liteos --sysroot=${SYSROOT_PATH}
++CFLAGS+=        --target=arm-liteos --sysroot=${SYSROOT_PATH} ${ARCH_CFLAGS}
  
  # XXX: for testfrmw.c -- needs to be moved into a library.
  CFLAGS+=		-I\$(srcdir)
-@@ -303,6 +305,9 @@
+@@ -303,6 +305,10 @@
  GLOBAL_BOILERPLATE="${TOP_SRCDIR}/.global_boilerplate"
  
  CONFIG_MK="../../include/mk/config-openposix.mk"
 +COMPILE_PATH=$1
 +BUILD_ROOT_PATH=$2
 +SYSROOT_PATH=$3
++ARCH_CFLAGS=$4
  
  rm -f "$GLOBAL_BOILERPLATE"