Added signing_blackdirs script in all wrt suites

Change-Id: I32b83d69329e9c919effa27e8a36dec07ff6f87f
Signed-off-by: Hao Yunfei <yunfeix.hao@intel.com>

diff --git a/tct-ext01-wrt-tests/pack.sh b/tct-ext01-wrt-tests/pack.sh
index 8a9b8ab..fcdcd88 100755 (executable)
--- a/tct-ext01-wrt-tests/pack.sh
+++ b/tct-ext01-wrt-tests/pack.sh
@@ -40,6 +40,7 @@ pack_fail='FALSE'
 suite_dir=${PWD}
 all_dirs=`ls -l --time-style="long-iso" $suite_dir | grep '^d' | awk '{print $8}'`
 black_dirs=''
+signing_black_dirs=''
 
 #black list reserved for some non-suite folders.
 if [ -f "$suite_dir/blackdirs" ]; then
@@ -47,6 +48,12 @@ if [ -f "$suite_dir/blackdirs" ]; then
     echo "Got black dirs: $black_dirs"
 fi
 
+#signning black list reserved for some non-signing folders.
+if [ -f "$suite_dir/signing_blackdirs" ]; then
+    signing_black_dirs=`cat $suite_dir/signing_blackdirs`
+    echo "Got signing black dirs: $signing_black_dirs"
+fi
+
 function check_blackdir()
 {
   for bdir in ${black_dirs[@]}; do
@@ -57,6 +64,16 @@ function check_blackdir()
   return 0
 }
 
+function check_signing_blackdir()
+{
+  for signing_bdir in ${signing_black_dirs[@]}; do
+    if [ $1 == $signing_bdir ]; then
+      return 1;
+    fi
+  done
+  return 0
+}
+
 # parse spec required name
 NAME=`grep "Name:" *.spec | awk '{print $2}'`
 if [ -z "$NAME" ];then
@@ -85,6 +102,12 @@ for app in $all_dirs; do
             pack_fail='TRUE'
             echo "Create $app.wgt fail, continue to pack others"
         else
+            check_signing_blackdir $app
+            if [ $? == 1 ];then
+               echo "Got a signing black dir: $app"
+               cd $suite_dir
+               continue
+            fi
            if [ -d "../../signing" ]; then
                 echo "Start sign wgt ..."
                 cd ../../signing

diff --git a/tct-ext02-wrt-tests/pack.sh b/tct-ext02-wrt-tests/pack.sh
index 8a9b8ab..fcdcd88 100755 (executable)
--- a/tct-ext02-wrt-tests/pack.sh
+++ b/tct-ext02-wrt-tests/pack.sh
@@ -40,6 +40,7 @@ pack_fail='FALSE'
 suite_dir=${PWD}
 all_dirs=`ls -l --time-style="long-iso" $suite_dir | grep '^d' | awk '{print $8}'`
 black_dirs=''
+signing_black_dirs=''
 
 #black list reserved for some non-suite folders.
 if [ -f "$suite_dir/blackdirs" ]; then
@@ -47,6 +48,12 @@ if [ -f "$suite_dir/blackdirs" ]; then
     echo "Got black dirs: $black_dirs"
 fi
 
+#signning black list reserved for some non-signing folders.
+if [ -f "$suite_dir/signing_blackdirs" ]; then
+    signing_black_dirs=`cat $suite_dir/signing_blackdirs`
+    echo "Got signing black dirs: $signing_black_dirs"
+fi
+
 function check_blackdir()
 {
   for bdir in ${black_dirs[@]}; do
@@ -57,6 +64,16 @@ function check_blackdir()
   return 0
 }
 
+function check_signing_blackdir()
+{
+  for signing_bdir in ${signing_black_dirs[@]}; do
+    if [ $1 == $signing_bdir ]; then
+      return 1;
+    fi
+  done
+  return 0
+}
+
 # parse spec required name
 NAME=`grep "Name:" *.spec | awk '{print $2}'`
 if [ -z "$NAME" ];then
@@ -85,6 +102,12 @@ for app in $all_dirs; do
             pack_fail='TRUE'
             echo "Create $app.wgt fail, continue to pack others"
         else
+            check_signing_blackdir $app
+            if [ $? == 1 ];then
+               echo "Got a signing black dir: $app"
+               cd $suite_dir
+               continue
+            fi
            if [ -d "../../signing" ]; then
                 echo "Start sign wgt ..."
                 cd ../../signing

diff --git a/tct-pm-wrt-tests/pack.sh b/tct-pm-wrt-tests/pack.sh
index 8a9b8ab..fcdcd88 100755 (executable)
--- a/tct-pm-wrt-tests/pack.sh
+++ b/tct-pm-wrt-tests/pack.sh
@@ -40,6 +40,7 @@ pack_fail='FALSE'
 suite_dir=${PWD}
 all_dirs=`ls -l --time-style="long-iso" $suite_dir | grep '^d' | awk '{print $8}'`
 black_dirs=''
+signing_black_dirs=''
 
 #black list reserved for some non-suite folders.
 if [ -f "$suite_dir/blackdirs" ]; then
@@ -47,6 +48,12 @@ if [ -f "$suite_dir/blackdirs" ]; then
     echo "Got black dirs: $black_dirs"
 fi
 
+#signning black list reserved for some non-signing folders.
+if [ -f "$suite_dir/signing_blackdirs" ]; then
+    signing_black_dirs=`cat $suite_dir/signing_blackdirs`
+    echo "Got signing black dirs: $signing_black_dirs"
+fi
+
 function check_blackdir()
 {
   for bdir in ${black_dirs[@]}; do
@@ -57,6 +64,16 @@ function check_blackdir()
   return 0
 }
 
+function check_signing_blackdir()
+{
+  for signing_bdir in ${signing_black_dirs[@]}; do
+    if [ $1 == $signing_bdir ]; then
+      return 1;
+    fi
+  done
+  return 0
+}
+
 # parse spec required name
 NAME=`grep "Name:" *.spec | awk '{print $2}'`
 if [ -z "$NAME" ];then
@@ -85,6 +102,12 @@ for app in $all_dirs; do
             pack_fail='TRUE'
             echo "Create $app.wgt fail, continue to pack others"
         else
+            check_signing_blackdir $app
+            if [ $? == 1 ];then
+               echo "Got a signing black dir: $app"
+               cd $suite_dir
+               continue
+            fi
            if [ -d "../../signing" ]; then
                 echo "Start sign wgt ..."
                 cd ../../signing

diff --git a/tct-rt01-wrt-tests/pack.sh b/tct-rt01-wrt-tests/pack.sh
index 8a9b8ab..fcdcd88 100755 (executable)
--- a/tct-rt01-wrt-tests/pack.sh
+++ b/tct-rt01-wrt-tests/pack.sh
@@ -40,6 +40,7 @@ pack_fail='FALSE'
 suite_dir=${PWD}
 all_dirs=`ls -l --time-style="long-iso" $suite_dir | grep '^d' | awk '{print $8}'`
 black_dirs=''
+signing_black_dirs=''
 
 #black list reserved for some non-suite folders.
 if [ -f "$suite_dir/blackdirs" ]; then
@@ -47,6 +48,12 @@ if [ -f "$suite_dir/blackdirs" ]; then
     echo "Got black dirs: $black_dirs"
 fi
 
+#signning black list reserved for some non-signing folders.
+if [ -f "$suite_dir/signing_blackdirs" ]; then
+    signing_black_dirs=`cat $suite_dir/signing_blackdirs`
+    echo "Got signing black dirs: $signing_black_dirs"
+fi
+
 function check_blackdir()
 {
   for bdir in ${black_dirs[@]}; do
@@ -57,6 +64,16 @@ function check_blackdir()
   return 0
 }
 
+function check_signing_blackdir()
+{
+  for signing_bdir in ${signing_black_dirs[@]}; do
+    if [ $1 == $signing_bdir ]; then
+      return 1;
+    fi
+  done
+  return 0
+}
+
 # parse spec required name
 NAME=`grep "Name:" *.spec | awk '{print $2}'`
 if [ -z "$NAME" ];then
@@ -85,6 +102,12 @@ for app in $all_dirs; do
             pack_fail='TRUE'
             echo "Create $app.wgt fail, continue to pack others"
         else
+            check_signing_blackdir $app
+            if [ $? == 1 ];then
+               echo "Got a signing black dir: $app"
+               cd $suite_dir
+               continue
+            fi
            if [ -d "../../signing" ]; then
                 echo "Start sign wgt ..."
                 cd ../../signing

diff --git a/tct-rt02-wrt-tests/pack.sh b/tct-rt02-wrt-tests/pack.sh
index 8a9b8ab..fcdcd88 100755 (executable)
--- a/tct-rt02-wrt-tests/pack.sh
+++ b/tct-rt02-wrt-tests/pack.sh
@@ -40,6 +40,7 @@ pack_fail='FALSE'
 suite_dir=${PWD}
 all_dirs=`ls -l --time-style="long-iso" $suite_dir | grep '^d' | awk '{print $8}'`
 black_dirs=''
+signing_black_dirs=''
 
 #black list reserved for some non-suite folders.
 if [ -f "$suite_dir/blackdirs" ]; then
@@ -47,6 +48,12 @@ if [ -f "$suite_dir/blackdirs" ]; then
     echo "Got black dirs: $black_dirs"
 fi
 
+#signning black list reserved for some non-signing folders.
+if [ -f "$suite_dir/signing_blackdirs" ]; then
+    signing_black_dirs=`cat $suite_dir/signing_blackdirs`
+    echo "Got signing black dirs: $signing_black_dirs"
+fi
+
 function check_blackdir()
 {
   for bdir in ${black_dirs[@]}; do
@@ -57,6 +64,16 @@ function check_blackdir()
   return 0
 }
 
+function check_signing_blackdir()
+{
+  for signing_bdir in ${signing_black_dirs[@]}; do
+    if [ $1 == $signing_bdir ]; then
+      return 1;
+    fi
+  done
+  return 0
+}
+
 # parse spec required name
 NAME=`grep "Name:" *.spec | awk '{print $2}'`
 if [ -z "$NAME" ];then
@@ -85,6 +102,12 @@ for app in $all_dirs; do
             pack_fail='TRUE'
             echo "Create $app.wgt fail, continue to pack others"
         else
+            check_signing_blackdir $app
+            if [ $? == 1 ];then
+               echo "Got a signing black dir: $app"
+               cd $suite_dir
+               continue
+            fi
            if [ -d "../../signing" ]; then
                 echo "Start sign wgt ..."
                 cd ../../signing

diff --git a/tct-sp-wrt-tests/pack.sh b/tct-sp-wrt-tests/pack.sh
index 8a9b8ab..fcdcd88 100755 (executable)
--- a/tct-sp-wrt-tests/pack.sh
+++ b/tct-sp-wrt-tests/pack.sh
@@ -40,6 +40,7 @@ pack_fail='FALSE'
 suite_dir=${PWD}
 all_dirs=`ls -l --time-style="long-iso" $suite_dir | grep '^d' | awk '{print $8}'`
 black_dirs=''
+signing_black_dirs=''
 
 #black list reserved for some non-suite folders.
 if [ -f "$suite_dir/blackdirs" ]; then
@@ -47,6 +48,12 @@ if [ -f "$suite_dir/blackdirs" ]; then
     echo "Got black dirs: $black_dirs"
 fi
 
+#signning black list reserved for some non-signing folders.
+if [ -f "$suite_dir/signing_blackdirs" ]; then
+    signing_black_dirs=`cat $suite_dir/signing_blackdirs`
+    echo "Got signing black dirs: $signing_black_dirs"
+fi
+
 function check_blackdir()
 {
   for bdir in ${black_dirs[@]}; do
@@ -57,6 +64,16 @@ function check_blackdir()
   return 0
 }
 
+function check_signing_blackdir()
+{
+  for signing_bdir in ${signing_black_dirs[@]}; do
+    if [ $1 == $signing_bdir ]; then
+      return 1;
+    fi
+  done
+  return 0
+}
+
 # parse spec required name
 NAME=`grep "Name:" *.spec | awk '{print $2}'`
 if [ -z "$NAME" ];then
@@ -85,6 +102,12 @@ for app in $all_dirs; do
             pack_fail='TRUE'
             echo "Create $app.wgt fail, continue to pack others"
         else
+            check_signing_blackdir $app
+            if [ $? == 1 ];then
+               echo "Got a signing black dir: $app"
+               cd $suite_dir
+               continue
+            fi
            if [ -d "../../signing" ]; then
                 echo "Start sign wgt ..."
                 cd ../../signing

diff --git a/tct-stab-wrt-tests/pack.sh b/tct-stab-wrt-tests/pack.sh
index 8a9b8ab..fcdcd88 100755 (executable)
--- a/tct-stab-wrt-tests/pack.sh
+++ b/tct-stab-wrt-tests/pack.sh
@@ -40,6 +40,7 @@ pack_fail='FALSE'
 suite_dir=${PWD}
 all_dirs=`ls -l --time-style="long-iso" $suite_dir | grep '^d' | awk '{print $8}'`
 black_dirs=''
+signing_black_dirs=''
 
 #black list reserved for some non-suite folders.
 if [ -f "$suite_dir/blackdirs" ]; then
@@ -47,6 +48,12 @@ if [ -f "$suite_dir/blackdirs" ]; then
     echo "Got black dirs: $black_dirs"
 fi
 
+#signning black list reserved for some non-signing folders.
+if [ -f "$suite_dir/signing_blackdirs" ]; then
+    signing_black_dirs=`cat $suite_dir/signing_blackdirs`
+    echo "Got signing black dirs: $signing_black_dirs"
+fi
+
 function check_blackdir()
 {
   for bdir in ${black_dirs[@]}; do
@@ -57,6 +64,16 @@ function check_blackdir()
   return 0
 }
 
+function check_signing_blackdir()
+{
+  for signing_bdir in ${signing_black_dirs[@]}; do
+    if [ $1 == $signing_bdir ]; then
+      return 1;
+    fi
+  done
+  return 0
+}
+
 # parse spec required name
 NAME=`grep "Name:" *.spec | awk '{print $2}'`
 if [ -z "$NAME" ];then
@@ -85,6 +102,12 @@ for app in $all_dirs; do
             pack_fail='TRUE'
             echo "Create $app.wgt fail, continue to pack others"
         else
+            check_signing_blackdir $app
+            if [ $? == 1 ];then
+               echo "Got a signing black dir: $app"
+               cd $suite_dir
+               continue
+            fi
            if [ -d "../../signing" ]; then
                 echo "Start sign wgt ..."
                 cd ../../signing

diff --git a/tct-ui-wrt-tests/pack.sh b/tct-ui-wrt-tests/pack.sh
index 8a9b8ab..fcdcd88 100755 (executable)
--- a/tct-ui-wrt-tests/pack.sh
+++ b/tct-ui-wrt-tests/pack.sh
@@ -40,6 +40,7 @@ pack_fail='FALSE'
 suite_dir=${PWD}
 all_dirs=`ls -l --time-style="long-iso" $suite_dir | grep '^d' | awk '{print $8}'`
 black_dirs=''
+signing_black_dirs=''
 
 #black list reserved for some non-suite folders.
 if [ -f "$suite_dir/blackdirs" ]; then
@@ -47,6 +48,12 @@ if [ -f "$suite_dir/blackdirs" ]; then
     echo "Got black dirs: $black_dirs"
 fi
 
+#signning black list reserved for some non-signing folders.
+if [ -f "$suite_dir/signing_blackdirs" ]; then
+    signing_black_dirs=`cat $suite_dir/signing_blackdirs`
+    echo "Got signing black dirs: $signing_black_dirs"
+fi
+
 function check_blackdir()
 {
   for bdir in ${black_dirs[@]}; do
@@ -57,6 +64,16 @@ function check_blackdir()
   return 0
 }
 
+function check_signing_blackdir()
+{
+  for signing_bdir in ${signing_black_dirs[@]}; do
+    if [ $1 == $signing_bdir ]; then
+      return 1;
+    fi
+  done
+  return 0
+}
+
 # parse spec required name
 NAME=`grep "Name:" *.spec | awk '{print $2}'`
 if [ -z "$NAME" ];then
@@ -85,6 +102,12 @@ for app in $all_dirs; do
             pack_fail='TRUE'
             echo "Create $app.wgt fail, continue to pack others"
         else
+            check_signing_blackdir $app
+            if [ $? == 1 ];then
+               echo "Got a signing black dir: $app"
+               cd $suite_dir
+               continue
+            fi
            if [ -d "../../signing" ]; then
                 echo "Start sign wgt ..."
                 cd ../../signing