From 70d558be8ff98c4d4eaa1ee78bf6ce6ad813ea5b Mon Sep 17 00:00:00 2001 From: Mohit Agarwal Date: Fri, 4 Dec 2015 00:41:44 +0530 Subject: [PATCH] misc/cgo/testsanitizers: check linux major/minor versions Fix a typo in de5b386; using `$ver` to determine linux major/minor versions would produce those for clang, use `$linuxver` instead. Updates #12898. Change-Id: I2c8e84ad02749fceaa958afd65e558bb0b08dddb Reviewed-on: https://go-review.googlesource.com/17323 Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot --- misc/cgo/testsanitizers/test.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/cgo/testsanitizers/test.bash b/misc/cgo/testsanitizers/test.bash index bc25617b6c..269db2f341 100755 --- a/misc/cgo/testsanitizers/test.bash +++ b/misc/cgo/testsanitizers/test.bash @@ -33,14 +33,14 @@ if $CC --version | grep clang >& /dev/null; then echo "skipping msan test; clang version $major.$minor (older than 3.6)" exit 0 fi - + # Clang before 3.8 does not work with Linux at or after 4.1. # golang.org/issue/12898. if test "$major" -lt 3 || test "$major" -eq 3 -a "$minor" -lt 8; then if test "$(uname)" = Linux; then linuxver=$(uname -r) - linuxmajor=$(echo $ver | sed -e 's/\([0-9]*\).*/\1/') - linuxminor=$(echo $ver | sed -e 's/[0-9]*\.\([0-9]*\).*/\1/') + linuxmajor=$(echo $linuxver | sed -e 's/\([0-9]*\).*/\1/') + linuxminor=$(echo $linuxver | sed -e 's/[0-9]*\.\([0-9]*\).*/\1/') if test "$linuxmajor" -gt 4 || test "$linuxmajor" -eq 4 -a "$linuxminor" -ge 1; then echo "skipping msan test; clang version $major.$minor (older than 3.8) incompatible with linux version $linuxmajor.$linuxminor (4.1 or newer)" exit 0 -- 2.50.0