From 3524de618357a31dc34f12c7c4a464d471a0c1d1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=D0=94=D0=B8=D0=BB=D1=88=D0=BE=D0=B4=D0=B6=D0=BE=D0=BD=20?=
 =?utf8?q?=D0=A3=D0=BC=D1=80=D0=BE=D0=BD=D1=85=D0=BE=D0=BD=D0=BE=D0=B2?=
 =?utf8?q?=D0=B8=D1=87=20=D0=9F=D0=BE=D1=88=D1=88=D0=BE=D0=B5=D0=B2/AI=20T?=
 =?utf8?q?ools=20Lab=20/SRR/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?=
 <d.poshshoev@samsung.com>
Date: Fri, 2 Aug 2019 05:07:12 +0300
Subject: [PATCH] Fix verify_downloaded_file usage in run_test.sh (#6070)

run_test.sh downloads model files even they exist. It is fixed now

Signed-off-by: Poshshoev Dilshodzhon <d.poshshoev@samsung.com>
---
 tests/framework/run_test.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tests/framework/run_test.sh b/tests/framework/run_test.sh
index a9feaab..9309715 100755
--- a/tests/framework/run_test.sh
+++ b/tests/framework/run_test.sh
@@ -36,24 +36,26 @@ function Usage()
     echo ""
 }
 
-function verify_downloaded_file()
+function need_download()
 {
     LOCAL_PATH=$1
     REMOTE_URL=$2
-
+    if [ ! -e $LOCAL_PATH ]; then
+        return 0;
+    fi
     # Ignore checking md5 in cache
     if [ ! -z $IGNORE_MD5 ] && [ "$IGNORE_MD5" == "1" ]; then
-        return 0
+        return 1
     fi
 
     LOCAL_HASH=$(md5sum $LOCAL_PATH | awk '{ print $1 }')
-    REMOTE_HASH=$(curl -I -ss $REMOTE_URL | grep '^Content-MD5' | tr -d '\r\n' | awk '{ print $2 }' | base64 -d | xxd -p)
+    REMOTE_HASH=$(curl -ss $REMOTE_URL | md5sum  | awk '{ print $1 }')
     # TODO Emit an error when Content-MD5 field was not found. (Server configuration issue)
-
     if [ "$LOCAL_HASH" != "$REMOTE_HASH" ]; then
         echo "Downloaded file is outdated or incomplete."
-        return 1
+        return 0
     fi
+    return 1
 }
 
 DRIVER_BIN=""
@@ -159,7 +161,7 @@ run_tests()
         fi
 
         # Download unless we have it in cache (Also check md5sum)
-        if [ ! -e $MODELFILE ] || ! verify_downloaded_file "$MODELFILE" "$MODELFILE_URL"; then
+        if need_download "$MODELFILE" "$MODELFILE_URL"; then
             echo ""
             echo "Download test file for $TEST_NAME"
             echo "======================"
@@ -231,7 +233,7 @@ download_tests()
         fi
 
         # Download unless we have it in cache (Also check md5sum)
-        if [ ! -e $MODELFILE ] || ! verify_downloaded_file "$MODELFILE" "$MODELFILE_URL"; then
+        if need_download "$MODELFILE" "$MODELFILE_URL"; then
             echo ""
             echo "Download test file for $TEST_NAME"
             echo "======================"
-- 
2.7.4