[kvm-unit-tests PATCH v4 13/13] scripts/run: generalize check

From: "Radim Krčmář" <rkrcmar@redhat.com>
To: kvm@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>, Andrew Jones <drjones@redhat.com>
Subject: [kvm-unit-tests PATCH v4 13/13] scripts/run: generalize check
Date: Wed, 11 May 2016 18:30:43 +0200	[thread overview]
Message-ID: <1462984243-5783-4-git-send-email-rkrcmar@redhat.com> (raw)
In-Reply-To: <1462984243-5783-1-git-send-email-rkrcmar@redhat.com>

config attribute "check" is currently unused and a simpler imlementation
has better chances of being used.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
 v4: new

 scripts/runtime.bash | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index c9ab9ba47d81..7f9bf9a2de0e 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -57,17 +57,11 @@ function run()
         return 2
     fi
 
-    # check a file for a particular value before running a test
-    # the check line can contain multiple files to check separated by a space
-    # but each check parameter needs to be of the form <path>=<value>
-    for check_param in ${check[@]}; do
-        path=${check_param%%=*}
-        value=${check_param#*=}
-        if [ "$path" ] && [ "$(cat $path)" != "$value" ]; then
-            echo "`SKIP` $1 ($path not equal to $value)"
-            return 2
-        fi
-    done
+    eval $check || {
+        echo "skipped $testname (\`$check\` returned $?)" | RUNTIME_log_stderr
+        echo "`SKIP` $testname (check failed)"
+        return 77
+    }
 
     last_line=$(premature_failure) && {
         echo "`SKIP` $1 ($last_line)"
-- 
2.8.2

