Whamcloud - gitweb
LU-12761: tests: make version_code() accept two number versions too 75/36275/7
authorOleg Drokin <green@whamcloud.com>
Mon, 23 Sep 2019 12:39:48 +0000 (08:39 -0400)
committerOleg Drokin <green@whamcloud.com>
Sun, 1 Mar 2020 05:35:35 +0000 (05:35 +0000)
There's now a user in sanity test 103a that calls version_code with
2.6.  Andreas rightfully points instead of fixing the caller we can
just update the code to accept this usage.

Change-Id: I5915cd08a36946c6d26f2e231aa7a820a3eef46a
Signed-off-by: Oleg Drokin <green@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/36275
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
lustre/tests/test-framework.sh

index 23b01eb..7e2d909 100755 (executable)
@@ -451,7 +451,7 @@ version_code() {
        # split arguments like "1.8.6-wc3" into "1", "8", "6", "wc3"
        eval set -- $(tr "[:punct:]" " " <<< $*)
 
-       echo -n "$((($1 << 16) | ($2 << 8) | $3))"
+       echo -n "$(((${1:-0} << 16) | (${2:-0} << 8) | ${3:-0}))"
 }
 
 export LINUX_VERSION=$(uname -r | sed -e "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/")