aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-04-02 11:00:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-02 11:00:01 +0000
commit747e2ee2ccd1e1448fae8b888dcb50d30b099e5d (patch)
treea6da98e74cb1cd24a4a126e0244772c5dd259970
parent36ea4a4ef890f863312f03ebc5042b235269882c (diff)
parentc73b46f40a3e47ed9989cf1c9681901572b508be (diff)
downloadlatinime-747e2ee2ccd1e1448fae8b888dcb50d30b099e5d.tar.gz
latinime-747e2ee2ccd1e1448fae8b888dcb50d30b099e5d.tar.xz
latinime-747e2ee2ccd1e1448fae8b888dcb50d30b099e5d.zip
am c73b46f4: Do not call exit 1 when loaded with source command
* commit 'c73b46f40a3e47ed9989cf1c9681901572b508be': Do not call exit 1 when loaded with source command
-rwxr-xr-xnative/jni/run-tests.sh2
-rwxr-xr-xtools/dicttool/tests/etc/test-dicttool.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/native/jni/run-tests.sh b/native/jni/run-tests.sh
index 898ea1610..5b60e0d65 100755
--- a/native/jni/run-tests.sh
+++ b/native/jni/run-tests.sh
@@ -18,7 +18,7 @@ echo "Usage:" 1>&2
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
diff --git a/tools/dicttool/tests/etc/test-dicttool.sh b/tools/dicttool/tests/etc/test-dicttool.sh
index 5eb44fc85..f96db6816 100755
--- a/tools/dicttool/tests/etc/test-dicttool.sh
+++ b/tools/dicttool/tests/etc/test-dicttool.sh
@@ -18,7 +18,7 @@ echo "Usage:" 1>&2
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