If the unittests.cfg file specifies an accel parameter then don't
let the user override it.
Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
---
scripts/runtime.bash | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/scripts/runtime.bash b/scripts/runtime.bash
index eb6089091e23..8bfe31cb9f66 100644
--- a/scripts/runtime.bash
+++ b/scripts/runtime.bash
@@ -77,7 +77,7 @@ function run()
local opts="$5"
local arch="$6"
local check="${CHECK:-$7}"
- local accel="${ACCEL:-$8}"
+ local accel="$8"
local timeout="${9:-$TIMEOUT}" # unittests.cfg overrides the default
if [ -z "$testname" ]; then
@@ -103,6 +103,13 @@ function run()
return 2
fi
+ if [ -n "$accel" ] && [ -n "$ACCEL" ] && [ "$accel" != "$ACCEL" ]; then
+ print_result "SKIP" $testname "" "$accel only, but ACCEL=$ACCEL"
+ return 2
+ elif [ -n "$ACCEL" ]; then
+ accel="$ACCEL"
+ 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>
--
2.25.1
