From eeade1596df7bd52fab3b3a4b39266f39ffa6fb1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
Date: Thu, 2 Dec 2010 10:20:59 +0100
Subject: [PATCH] tests: avoid bash in shebang and fix wrong "==" in test

---
 lib/subunit/shell/tests/test_function_output.sh | 10 +++++-----
 lib/subunit/shell/tests/test_source_library.sh  | 14 +++++++-------
 source3/script/tests/test_smbclient_s3.sh       |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/subunit/shell/tests/test_function_output.sh b/lib/subunit/shell/tests/test_function_output.sh
index b78eee6946e..6e500cff5ca 100755
--- a/lib/subunit/shell/tests/test_function_output.sh
+++ b/lib/subunit/shell/tests/test_function_output.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #  subunit shell bindings.
 #  Copyright (C) 2006  Robert Collins <robertc@robertcollins.net>
 #
@@ -29,7 +29,7 @@
 echo 'test: subunit_start_test output'
 func_output=$(subunit_start_test "foo bar")
 func_status=$?
-if [ $func_status == 0 -a "x$func_output" = "xtest: foo bar" ]; then
+if [ $func_status -eq 0 -a "x$func_output" = "xtest: foo bar" ]; then
   echo 'success: subunit_start_test output'
 else
   echo 'failure: subunit_start_test output ['
@@ -42,7 +42,7 @@ fi
 subunit_start_test "subunit_pass_test output"
 func_output=$(subunit_pass_test "foo bar")
 func_status=$?
-if [ $func_status == 0 -a "x$func_output" = "xsuccess: foo bar" ]; then
+if [ $func_status -eq 0 -a "x$func_output" = "xsuccess: foo bar" ]; then
   subunit_pass_test "subunit_pass_test output"
 else
   echo 'failure: subunit_pass_test output ['
@@ -60,7 +60,7 @@ here
 END
 )
 func_status=$?
-if [ $func_status == 0 -a "x$func_output" = "xfailure: foo bar [
+if [ $func_status -eq 0 -a "x$func_output" = "xfailure: foo bar [
 something
   wrong
 here
@@ -82,7 +82,7 @@ here
 END
 )
 func_status=$?
-if [ $func_status == 0 -a "x$func_output" = "xerror: foo bar [
+if [ $func_status -eq 0 -a "x$func_output" = "xerror: foo bar [
 something
   died
 here
diff --git a/lib/subunit/shell/tests/test_source_library.sh b/lib/subunit/shell/tests/test_source_library.sh
index 699f1281bc9..3ef6ffeb362 100755
--- a/lib/subunit/shell/tests/test_source_library.sh
+++ b/lib/subunit/shell/tests/test_source_library.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #  subunit shell bindings.
 #  Copyright (C) 2006  Robert Collins <robertc@robertcollins.net>
 #
@@ -24,7 +24,7 @@
 echo 'test: shell bindings can be sourced'
 # if any output occurs, this has failed to source cleanly
 source_output=$(. ${SHELL_SHARE}subunit.sh 2>&1)
-if [ $? == 0 -a "x$source_output" = "x" ]; then
+if [ $? -eq 0 -a "x$source_output" = "x" ]; then
   echo 'success: shell bindings can be sourced'
 else
   echo 'failure: shell bindings can be sourced ['
@@ -40,7 +40,7 @@ fi
 echo 'test: subunit_start_test exists'
 found_type=$(type -t subunit_start_test)
 status=$?
-if [ $status == 0 -a "x$found_type" = "xfunction" ]; then
+if [ $status -eq 0 -a "x$found_type" = "xfunction" ]; then
   echo 'success: subunit_start_test exists'
 else
   echo 'failure: subunit_start_test exists ['
@@ -54,7 +54,7 @@ fi
 echo 'test: subunit_pass_test exists'
 found_type=$(type -t subunit_pass_test)
 status=$?
-if [ $status == 0 -a "x$found_type" = "xfunction" ]; then
+if [ $status -eq 0 -a "x$found_type" = "xfunction" ]; then
   echo 'success: subunit_pass_test exists'
 else
   echo 'failure: subunit_pass_test exists ['
@@ -68,7 +68,7 @@ fi
 echo 'test: subunit_fail_test exists'
 found_type=$(type -t subunit_fail_test)
 status=$?
-if [ $status == 0 -a "x$found_type" = "xfunction" ]; then
+if [ $status -eq 0 -a "x$found_type" = "xfunction" ]; then
   echo 'success: subunit_fail_test exists'
 else
   echo 'failure: subunit_fail_test exists ['
@@ -82,7 +82,7 @@ fi
 echo 'test: subunit_error_test exists'
 found_type=$(type -t subunit_error_test)
 status=$?
-if [ $status == 0 -a "x$found_type" = "xfunction" ]; then
+if [ $status -eq 0 -a "x$found_type" = "xfunction" ]; then
   echo 'success: subunit_error_test exists'
 else
   echo 'failure: subunit_error_test exists ['
@@ -96,7 +96,7 @@ fi
 echo 'test: subunit_skip_test exists'
 found_type=$(type -t subunit_skip_test)
 status=$?
-if [ $status == 0 -a "x$found_type" = "xfunction" ]; then
+if [ $status -eq 0 -a "x$found_type" = "xfunction" ]; then
   echo 'success: subunit_skip_test exists'
 else
   echo 'failure: subunit_skip_test exists ['
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 22609033127..a56727449ce 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -380,7 +380,7 @@ test_ccache_access()
 	-c quit 2>&1
     ret=$?
 
-    if [ $ret == 0 ] ; then
+    if [ $ret -eq 0 ] ; then
 	echo "smbclient succeeded with wrong cached credentials"
 	false
 	return
-- 
2.11.4.GIT