modify into paddle_test

PaddlePaddle · Oct 19, 2023 · c0fe8c1 · c0fe8c1
1 parent d593076
commit c0fe8c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/cmake/generic.cmake b/cmake/generic.cmake
@@ -499,6 +499,12 @@ function(cc_test_run TARGET_NAME)
       NAME ${TARGET_NAME}
       COMMAND ${cc_test_COMMAND} ${cc_test_ARGS}
       WORKING_DIRECTORY ${cc_test_DIR})
+    set_property(
+      TEST ${TARGET_NAME}
+      PROPERTY
+        ENVIRONMENT
+        "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${PADDLE_BINARY_DIR}/python/paddle/libs:${PADDLE_BINARY_DIR}/python/paddle/base"
+    )
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT
                                               FLAGS_cpu_deterministic=true)
     set_property(TEST ${TARGET_NAME} PROPERTY ENVIRONMENT

diff --git a/test/cpp/pir/cinn/CMakeLists.txt b/test/cpp/pir/cinn/CMakeLists.txt
@@ -1,19 +1,10 @@
 if(WITH_TESTING AND WITH_CINN)
-  cc_test_old(
-    test_pir_compiler
-    SRCS
-    pir_compiler_test.cc
-    DEPS
-    pir_compiler
-    cinn_runtime_dialect
-    pir
-    phi
-    gtest
-    glog)
+  paddle_test(test_pir_compiler SRCS pir_compiler_test.cc DEPS pir_compiler
+              cinn_runtime_dialect)
   set_tests_properties(test_pir_compiler PROPERTIES LABELS "RUN_TYPE=CINN")
 
-  cc_test_old(test_jit_instruction SRCS jit_instruction_test.cc DEPS
-              interpreter pir_compiler)
+  paddle_test(test_jit_instruction SRCS jit_instruction_test.cc DEPS
+              cinn_runtime_dialect pir_compiler)
   set_tests_properties(test_jit_instruction PROPERTIES LABELS "RUN_TYPE=CINN")
 
   cc_test_old(