Bug 915311 - Improve MOZ_HOST_BIN warnings; r=ted

This commit is contained in:
Geoff Brown 2013-11-05 15:27:08 -07:00
parent 3ca51a58fb
commit 042bb02ecc

View File

@ -90,8 +90,12 @@ endif
mochitest-remote: DM_TRANS?=adb
mochitest-remote:
@if [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \
echo "please prepare your host with the environment variable MOZ_HOST_BIN"; \
@if [ "${MOZ_HOST_BIN}" = "" ]; then \
echo "environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell"; \
elif [ ! -d ${MOZ_HOST_BIN} ]; then \
echo "MOZ_HOST_BIN does not specify a directory"; \
elif [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \
echo "xpcshell not found in MOZ_HOST_BIN"; \
elif [ "${TEST_DEVICE}" = "" -a "$(DM_TRANS)" != "adb" ]; then \
echo "please prepare your host with the environment variable TEST_DEVICE"; \
else \
@ -103,8 +107,12 @@ mochitest-robotium: mochitest-robocop
mochitest-robocop: DM_TRANS?=adb
mochitest-robocop:
@if [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \
echo "please prepare your host with the environment variable MOZ_HOST_BIN"; \
@if [ "${MOZ_HOST_BIN}" = "" ]; then \
echo "environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell"; \
elif [ ! -d ${MOZ_HOST_BIN} ]; then \
echo "MOZ_HOST_BIN does not specify a directory"; \
elif [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \
echo "xpcshell not found in MOZ_HOST_BIN"; \
elif [ "${TEST_DEVICE}" = "" -a "$(DM_TRANS)" != "adb" ]; then \
echo "please prepare your host with the environment variable TEST_DEVICE"; \
else \
@ -212,8 +220,12 @@ reftest:
reftest-remote: TEST_PATH?=layout/reftests/reftest.list
reftest-remote: DM_TRANS?=adb
reftest-remote:
@if [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \
echo "please prepare your host with the environment variable MOZ_HOST_BIN"; \
@if [ "${MOZ_HOST_BIN}" = "" ]; then \
echo "environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell"; \
elif [ ! -d ${MOZ_HOST_BIN} ]; then \
echo "MOZ_HOST_BIN does not specify a directory"; \
elif [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \
echo "xpcshell not found in MOZ_HOST_BIN"; \
elif [ "${TEST_DEVICE}" = "" -a "$(DM_TRANS)" != "adb" ]; then \
echo "please prepare your host with the environment variable TEST_DEVICE"; \
else \
@ -224,8 +236,12 @@ reftest-remote:
reftest-b2g: TEST_PATH?=layout/reftests/reftest.list
reftest-b2g:
@if [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \
echo "please set the MOZ_HOST_BIN environment variable"; \
@if [ "${MOZ_HOST_BIN}" = "" ]; then \
echo "environment variable MOZ_HOST_BIN must be set to a directory containing host xpcshell"; \
elif [ ! -d ${MOZ_HOST_BIN} ]; then \
echo "MOZ_HOST_BIN does not specify a directory"; \
elif [ ! -f ${MOZ_HOST_BIN}/xpcshell ]; then \
echo "xpcshell not found in MOZ_HOST_BIN"; \
elif [ "${B2G_PATH}" = "" -o "${ADB_PATH}" = "" ]; then \
echo "please set the B2G_PATH and ADB_PATH environment variables"; \
else \