From 87bc6f2c0333fdcc211ee113b3ab97d7b82381ab Mon Sep 17 00:00:00 2001
From: tianshuo78520a <707759223@qq.com>
Date: Wed, 16 Aug 2023 19:56:50 +0800
Subject: [PATCH] Fix Mac Timeout Test (#56259)

* Fix Mac Timeout Test

* fix test

* fix

* Fix test

* Tesst

* Fix mac test
---
 paddle/scripts/paddle_build.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh
index c2cb5b105ef..ab563fa6ab8 100644
--- a/paddle/scripts/paddle_build.sh
+++ b/paddle/scripts/paddle_build.sh
@@ -687,14 +687,18 @@ EOF
         fi
         bash $PADDLE_ROOT/tools/check_added_ut.sh
         check_approvals_of_unittest 2
+        # serial_list: Some single tests need to reduce concurrency
+        single_list="^test_cdist$|^test_resnet$|^test_resnet_v2$|^test_concat_op$|^test_transformer$|^test_bert_with_stride$|^test_paddle_save_load$"
         get_precision_ut_mac
         if [[ "$on_precision" == "0" ]];then
-            ctest -E "($disable_ut_quickly)" -LE ${nightly_label} --output-on-failure -j $2 | tee $tmpfile
+          ctest -E "($disable_ut_quickly|$single_list)" -LE ${nightly_label} --output-on-failure -j $2 | tee $tmpfile
+          ctest -R "${single_list}" -E "($disable_ut_quickly)" --output-on-failure -j 1 | tee $tmpfile
         else
             ctest -R "($UT_list_prec)" -E "($disable_ut_quickly)" -LE ${nightly_label} --output-on-failure -j $2 | tee $tmpfile
             tmpfile_rand=`date +%s%N`
             tmpfile=$tmp_dir/$tmpfile_rand
-            ctest -R "($UT_list_prec_1)" -E "($disable_ut_quickly)" -LE ${nightly_label} --output-on-failure -j $2 | tee $tmpfile
+            ctest -R "($UT_list_prec_1)" -E "(${disable_ut_quickly}|${single_list})" -LE ${nightly_label} --output-on-failure -j $2 | tee $tmpfile
+            ctest -R "($single_list)" -E "(${disable_ut_quickly})" --output-on-failure -j 1 | tee $tmpfile
         fi
         failed_test_lists=''
         collect_failed_tests
@@ -930,7 +934,6 @@ set -ex
 
 function get_precision_ut_mac() {
     on_precision=0
-    serial_list="test_resnet|test_resnet_v2|test_concat_op|test_paddle_save_load"
     UT_list=$(ctest -N | awk -F ': ' '{print $2}' | sed '/^$/d' | sed '$d')
     precision_cases=""
     if [ ${PRECISION_TEST:-OFF} == "ON" ]; then
-- 
GitLab