diff --git a/tests/test-all.sh b/tests/test-all.sh
index a85ac39b44cc40a8db4c889a8cd793ab2b785aa2..19d78032554682d533c89bc4e4bd473689364d87 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -6,7 +6,16 @@ GREEN='\033[1;32m'
 GREEN_DARK='\033[0;32m'
 GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'
-
+function git_branch {
+   branch="`git branch 2>/dev/null | grep "^\*" | sed -e "s/^\*\ //"`"
+   if [ "${branch}" != "" ];then
+       if [ "${branch}" = "(no branch)" ];then
+           branch="(`git rev-parse --short HEAD`...)"
+       fi  
+       branch=(${branch////_})
+       echo "$branch"
+   fi  
+}
 function runSimCaseOneByOne {
   while read -r line; do
     if [[ $line =~ ^./test.sh* ]] || [[ $line =~ ^run* ]]; then
@@ -44,6 +53,11 @@ function runSimCaseOneByOnefq {
       
       out_log=`tail -1 out.log  `
       if [[ $out_log =~ 'failed' ]];then
+        if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then
+          cp -r ../../../sim ~/sim_$(git_branch)_`date "+%Y_%m_%d_%H:%M:%S"`
+        else 
+          cp -r ../../sim ~/sim_$(git_branch)_`date "+%Y_%m_%d_%H:%M:%S" `
+        fi
         exit 8
       fi
       end_time=`date +%s`
@@ -95,6 +109,7 @@ function runPyCaseOneByOnefq {
         end_time=`date +%s`
         out_log=`tail -1 pytest-out.log  `
         if [[ $out_log =~ 'failed' ]];then
+          cp -r ../../sim ~/sim_$(git_branch)_`date "+%Y_%m_%d_%H:%M:%S" `
           exit 8
         fi
         echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log