From 0ba8f3a9b05eea49189e989953ae059a08351032 Mon Sep 17 00:00:00 2001 From: Hao Yunfei Date: Sun, 9 Jun 2013 02:31:00 +0800 Subject: [PATCH] Fixed TTS-1527 to add signing_blackdirs in appwgt-wrt-tests Change-Id: I01f2fd5cd5a69141d8b6589d4e4f6e7a8cb77fab Signed-off-by: Hao Yunfei --- tct-appwgt-wrt-tests/pack.sh | 23 +++++++++++++++++++++++ tct-appwgt-wrt-tests/signing_blackdirs | 1 + 2 files changed, 24 insertions(+) create mode 100644 tct-appwgt-wrt-tests/signing_blackdirs diff --git a/tct-appwgt-wrt-tests/pack.sh b/tct-appwgt-wrt-tests/pack.sh index 8a9b8ab..fcdcd88 100755 --- a/tct-appwgt-wrt-tests/pack.sh +++ b/tct-appwgt-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-appwgt-wrt-tests/signing_blackdirs b/tct-appwgt-wrt-tests/signing_blackdirs new file mode 100644 index 0000000..a7da4fb --- /dev/null +++ b/tct-appwgt-wrt-tests/signing_blackdirs @@ -0,0 +1 @@ +app-widget-signature-invalid -- 2.7.4