commit c73b46f40a3e47ed9989cf1c9681901572b508be
author Yohei Yukawa <yukawa@google.com> Wed Apr 02 19:46:05 2014 +0900
committer Yohei Yukawa <yukawa@google.com> Wed Apr 02 19:47:08 2014 +0900
tree a6da98e74cb1cd24a4a126e0244772c5dd259970
parent 06b50ed5f29bcfc88526f8b5d5608afdbe00361b

Do not call exit 1 when loaded with source command

BUG: 13754552
Change-Id: I3d5e4c0786547521325405100c175dd1b21754df

native/jni/run-tests.sh

diff --git a/native/jni/run-tests.sh b/native/jni/run-tests.sh
index 898ea16..5b60e0d 100755
--- a/native/jni/run-tests.sh
+++ b/native/jni/run-tests.sh
@@ -18,7 +18,7 @@
 echo "    source $0" 1>&2
 echo "  or" 1>&2
 echo "    . $0" 1>&2
-exit 1
+if [[ ${BASH_SOURCE[0]} != $0 ]]; then return; else exit 1; fi
 fi
 
 pushd $PWD > /dev/null

tools/dicttool/tests/etc/test-dicttool.sh

diff --git a/tools/dicttool/tests/etc/test-dicttool.sh b/tools/dicttool/tests/etc/test-dicttool.sh
index 5eb44fc..f96db68 100755
--- a/tools/dicttool/tests/etc/test-dicttool.sh
+++ b/tools/dicttool/tests/etc/test-dicttool.sh
@@ -18,7 +18,7 @@
 echo "    source $0" 1>&2
 echo "  or" 1>&2
 echo "    . $0" 1>&2
-exit 1
+if [[ ${BASH_SOURCE[0]} != $0 ]]; then return; else exit 1; fi
 fi
 
 find out -name "dicttool_aosp*" -exec rm -rf {} \; > /dev/null 2>&1