From bbea5a1fa9d57b6a6d5283aa400859b676ac47ac Mon Sep 17 00:00:00 2001
From: YUNSHEN XIE <1084314248@qq.com>
Date: Tue, 19 Jan 2021 20:51:36 +0800
Subject: [PATCH] The new unit test cannot have the same name as the existing
 unit test (#29878)

* check UT Duplicate name

* fix error

* Optimized log display

* modified exit code
---
 paddle/scripts/paddle_build.sh | 12 ++++++++++++
 tools/check_added_ut.sh        |  1 +
 2 files changed, 13 insertions(+)

diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh
index 97729fbd3a..19d781700a 100755
--- a/paddle/scripts/paddle_build.sh
+++ b/paddle/scripts/paddle_build.sh
@@ -1072,6 +1072,18 @@ set -x
                 set -x
             fi
         fi
+        if [ -a "$PADDLE_ROOT/duplicate_ut" ];then
+            duplicate_uts=$(cat $PADDLE_ROOT/duplicate_ut|sed -e 's/\r//g')
+            if [[ "$duplicate_uts" != "" ]];then
+                set +x
+                echo "========================================"
+                echo "The new unit test has the same name as the existing unit test"
+                cat "$PADDLE_ROOT/duplicate_ut"
+                echo "========================================"
+                exit 102;
+                set -x
+            fi
+        fi
         if [ -a "$PADDLE_ROOT/added_ut" ];then
             added_uts=^$(awk BEGIN{RS=EOF}'{gsub(/\n/,"$|^");print}' $PADDLE_ROOT/added_ut)$
             ctest -R "(${added_uts})" --output-on-failure --repeat-until-fail 3 --timeout 15;added_ut_error=$?
diff --git a/tools/check_added_ut.sh b/tools/check_added_ut.sh
index 1dcba4a41c..2ea34771d1 100644
--- a/tools/check_added_ut.sh
+++ b/tools/check_added_ut.sh
@@ -36,6 +36,7 @@ cd $PADDLE_ROOT/build
 ctest -N | awk -F ':' '{print $2}' | sed '/^$/d' | sed '$d' | sed 's/ //g' > /$PADDLE_ROOT/pr-ut
 cd $PADDLE_ROOT
 grep -F -x -v -f br-ut pr-ut > $PADDLE_ROOT/added_ut
+sort pr-ut |uniq -d > $PADDLE_ROOT/duplicate_ut
 echo "New-UT:"
 cat $PADDLE_ROOT/added_ut
 rm -rf prec_build
-- 
GitLab