PaddlePaddle
diff --git a/‎paddle/common/flags_native.cc
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions b/‎paddle/common/flags_native.cc
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎paddle/utils/CMakeLists.txt
Copy file name to clipboard
-17Lines changed: 0 additions & 17 deletions b/‎paddle/utils/CMakeLists.txt
Copy file name to clipboard
-17Lines changed: 0 additions & 17 deletions
diff --git a/‎paddle/utils/string/CMakeLists.txt
Copy file name to clipboard
-10Lines changed: 0 additions & 10 deletions b/‎paddle/utils/string/CMakeLists.txt
Copy file name to clipboard
-10Lines changed: 0 additions & 10 deletions
diff --git a/‎test/cpp/CMakeLists.txt
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎test/cpp/CMakeLists.txt
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎test/cpp/utils/CMakeLists.txt
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions b/‎test/cpp/utils/CMakeLists.txt
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
diff --git a/‎paddle/utils/array_ref_test.cc renamed to ‎test/cpp/utils/array_ref_test.cc
Copy file name to clipboard b/‎paddle/utils/array_ref_test.cc renamed to ‎test/cpp/utils/array_ref_test.cc
Copy file name to clipboard
diff --git a/‎paddle/utils/flags_native_test.cc renamed to ‎test/cpp/utils/flags_native_test.cc
Copy file name to clipboard b/‎paddle/utils/flags_native_test.cc renamed to ‎test/cpp/utils/flags_native_test.cc
Copy file name to clipboard
diff --git a/‎paddle/utils/small_vector_test.cc renamed to ‎test/cpp/utils/small_vector_test.cc
Copy file name to clipboard b/‎paddle/utils/small_vector_test.cc renamed to ‎test/cpp/utils/small_vector_test.cc
Copy file name to clipboard
diff --git a/‎paddle/utils/span_test.cc renamed to ‎test/cpp/utils/span_test.cc
Copy file name to clipboard b/‎paddle/utils/span_test.cc renamed to ‎test/cpp/utils/span_test.cc
Copy file name to clipboard
diff --git a/‎test/cpp/utils/string/CMakeLists.txt
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions b/‎test/cpp/utils/string/CMakeLists.txt
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
@@ -511,8 +511,9 @@ T GetFromEnv(const std::string& name, const T& default_val) {
   }
 }
 
-#define INSTANTIATE_GET_FROM_ENV(type) \
-  template type GetFromEnv(const std::string& name, const type& default_val)
+#define INSTANTIATE_GET_FROM_ENV(type)                       \
+  template TEST_API type GetFromEnv(const std::string& name, \
+                                    const type& default_val)
 
 INSTANTIATE_GET_FROM_ENV(bool);
 INSTANTIATE_GET_FROM_ENV(int32_t);
 
@@ -11,23 +11,6 @@ add_subdirectory(string)
 #     DEPS paddle_flags)
 # endif()
 
-cc_test(
-  array_ref_test
-  SRCS array_ref_test.cc
-  DEPS gtest phi common)
-cc_test(
-  small_vector_test
-  SRCS small_vector_test.cc
-  DEPS gtest phi common)
-cc_test(
-  variant_test
-  SRCS variant_test.cc
-  DEPS gtest)
-cc_test(
-  span_test
-  SRCS span_test.cc
-  DEPS gtest)
-
 if(NOT ((NOT WITH_PYTHON) AND ON_INFER))
   cc_library(
     pybind_util
 
@@ -6,13 +6,3 @@ cc_library(
   string_helper
   SRCS string_helper.cc
   DEPS phi common)
-cc_test(
-  stringprintf_test
-  SRCS printf_test.cc
-  DEPS phi common)
-cc_test(to_string_test SRCS to_string_test.cc)
-cc_test(split_test SRCS split_test.cc)
-cc_test(
-  string_helper_test
-  SRCS string_helper_test.cc
-  DEPS string_helper)
@@ -8,3 +8,4 @@ add_subdirectory(pir)
 add_subdirectory(inference)
 add_subdirectory(eager)
 add_subdirectory(fluid)
+add_subdirectory(utils)
@@ -0,0 +1,19 @@
+# if(NOT WITH_GFLAGS)
+#   paddle_test(flags_native_test SRCS flags_native_test.cc)
+# endif()
+
+add_subdirectory(string)
+
+paddle_test(array_ref_test SRCS array_ref_test.cc)
+paddle_test(small_vector_test SRCS small_vector_test.cc)
+paddle_test(variant_test SRCS variant_test.cc)
+paddle_test(span_test SRCS span_test.cc)
+
+if(WITH_ONNXRUNTIME AND WIN32)
+  # Copy onnxruntime for some c++ test in Windows, since the test will
+  # be build only in CI, so suppose the generator in Windows is Ninja.
+  copy_onnx(array_ref_test)
+  copy_onnx(small_vector_test)
+  copy_onnx(variant_test)
+  copy_onnx(span_test)
+endif()
@@ -0,0 +1,13 @@
+paddle_test(stringprintf_test SRCS printf_test.cc)
+paddle_test(to_string_test SRCS to_string_test.cc)
+paddle_test(split_test SRCS split_test.cc)
+paddle_test(string_helper_test SRCS string_helper_test.cc DEPS string_helper)
+
+if(WITH_ONNXRUNTIME AND WIN32)
+  # Copy onnxruntime for some c++ test in Windows, since the test will
+  # be build only in CI, so suppose the generator in Windows is Ninja.
+  copy_onnx(stringprintf_test)
+  copy_onnx(to_string_test)
+  copy_onnx(split_test)
+  copy_onnx(string_helper_test)
+endif()
Original file line number	Diff line number	Diff line change
`@@ -511,8 +511,9 @@ T GetFromEnv(const std::string& name, const T& default_val) {`
`511`	`511`	`}`
`512`	`512`	`}`
`513`	`513`
`514`		`-#define INSTANTIATE_GET_FROM_ENV(type) \`
`515`		`- template type GetFromEnv(const std::string& name, const type& default_val)`
	`514`	`+#define INSTANTIATE_GET_FROM_ENV(type) \`
	`515`	`+ template TEST_API type GetFromEnv(const std::string& name, \`
	`516`	`+ const type& default_val)`
`516`	`517`
`517`	`518`	`INSTANTIATE_GET_FROM_ENV(bool);`
`518`	`519`	`INSTANTIATE_GET_FROM_ENV(int32_t);`