From a9824cd47c1927ffc4eca040d60aecaa26130329 Mon Sep 17 00:00:00 2001 From: Daniel Martí Date: Fri, 10 Mar 2017 17:15:46 +0000 Subject: *.bash: always use the same string equality operator POSIX Shell only supports = to compare variables inside '[' tests. But this is Bash, where == is an alias for =. In practice they're the same, but the current form is inconsisnent and breaks POSIX for no good reason. Change-Id: I38fa7a5a90658dc51acc2acd143049e510424ed8 Reviewed-on: https://go-review.googlesource.com/38031 Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot --- misc/cgo/fortran/test.bash | 2 +- misc/cgo/testcshared/test.bash | 18 +++++++++--------- misc/cgo/testsanitizers/test.bash | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'misc') diff --git a/misc/cgo/fortran/test.bash b/misc/cgo/fortran/test.bash index 3d1bc9de8e..1e0d59ea1c 100755 --- a/misc/cgo/fortran/test.bash +++ b/misc/cgo/fortran/test.bash @@ -12,7 +12,7 @@ FC=$1 goos=$(go env GOOS) libext="so" -if [ "$goos" == "darwin" ]; then +if [ "$goos" = "darwin" ]; then libext="dylib" fi diff --git a/misc/cgo/testcshared/test.bash b/misc/cgo/testcshared/test.bash index 052ee0e758..a0b9f78658 100755 --- a/misc/cgo/testcshared/test.bash +++ b/misc/cgo/testcshared/test.bash @@ -27,7 +27,7 @@ fi # Directory where cgo headers and outputs will be installed. # The installation directory format varies depending on the platform. installdir=pkg/${goos}_${goarch}_testcshared_shared -if [ "${goos}" == "darwin" ]; then +if [ "${goos}" = "darwin" ]; then installdir=pkg/${goos}_${goarch}_testcshared fi @@ -40,13 +40,13 @@ function cleanup() { rm -f testp testp2 testp3 testp4 testp5 rm -rf pkg "${goroot}/${installdir}" - if [ "$goos" == "android" ]; then + if [ "$goos" = "android" ]; then adb shell rm -rf "$androidpath" fi } trap cleanup EXIT -if [ "$goos" == "android" ]; then +if [ "$goos" = "android" ]; then adb shell mkdir -p "$androidpath" fi @@ -69,7 +69,7 @@ function run() { function binpush() { bin=${1} - if [ "$goos" == "android" ]; then + if [ "$goos" = "android" ]; then adb push "$bin" "${androidpath}/${bin}" 2>/dev/null fi } @@ -79,7 +79,7 @@ rm -rf pkg suffix="-installsuffix testcshared" libext="so" -if [ "$goos" == "darwin" ]; then +if [ "$goos" = "darwin" ]; then libext="dylib" fi @@ -89,7 +89,7 @@ GOPATH=$(pwd) go install -buildmode=c-shared $suffix libgo GOPATH=$(pwd) go build -buildmode=c-shared $suffix -o libgo.$libext src/libgo/libgo.go binpush libgo.$libext -if [ "$goos" == "linux" ] || [ "$goos" == "android" ] ; then +if [ "$goos" = "linux" ] || [ "$goos" = "android" ] ; then if readelf -d libgo.$libext | grep TEXTREL >/dev/null; then echo "libgo.$libext has TEXTREL set" exit 1 @@ -97,7 +97,7 @@ if [ "$goos" == "linux" ] || [ "$goos" == "android" ] ; then fi GOGCCFLAGS=$(go env GOGCCFLAGS) -if [ "$goos" == "android" ]; then +if [ "$goos" = "android" ]; then GOGCCFLAGS="${GOGCCFLAGS} -pie" fi @@ -127,7 +127,7 @@ fi GOPATH=$(pwd) go build -buildmode=c-shared $suffix -o libgo2.$libext libgo2 binpush libgo2.$libext linkflags="-Wl,--no-as-needed" -if [ "$goos" == "darwin" ]; then +if [ "$goos" = "darwin" ]; then linkflags="" fi $(go env CC) ${GOGCCFLAGS} -o testp2 main2.c $linkflags libgo2.$libext @@ -139,7 +139,7 @@ if [ "$output" != "PASS" ]; then fi # test3: tests main.main is exported on android. -if [ "$goos" == "android" ]; then +if [ "$goos" = "android" ]; then $(go env CC) ${GOGCCFLAGS} -o testp3 main3.c -ldl binpush testp3 output=$(run ./testp ./libgo.so) diff --git a/misc/cgo/testsanitizers/test.bash b/misc/cgo/testsanitizers/test.bash index 80de7388f6..3debb5499a 100755 --- a/misc/cgo/testsanitizers/test.bash +++ b/misc/cgo/testsanitizers/test.bash @@ -72,7 +72,7 @@ testmsanshared() { goos=$(go env GOOS) suffix="-installsuffix testsanitizers" libext="so" - if [ "$goos" == "darwin" ]; then + if [ "$goos" = "darwin" ]; then libext="dylib" fi go build -msan -buildmode=c-shared $suffix -o ${TMPDIR}/libmsanshared.$libext msan_shared.go @@ -135,7 +135,7 @@ testtsanshared() { goos=$(go env GOOS) suffix="-installsuffix tsan" libext="so" - if [ "$goos" == "darwin" ]; then + if [ "$goos" = "darwin" ]; then libext="dylib" fi go build -buildmode=c-shared $suffix -o ${TMPDIR}/libtsanshared.$libext tsan_shared.go -- cgit v1.3