Bug 669883 - add a make reftest-remote target to the source tree, do not require IP address. r=jmaher, a=test-only

This commit is contained in:
Brad Lassey 2011-07-15 22:01:08 -04:00
parent 8d99ffd9e5
commit b73b092d97

View File

@ -64,7 +64,7 @@ RUN_MOCHITEST = \
RUN_MOCHITEST_REMOTE = \
rm -f ./$@.log && \
$(PYTHON) _tests/testing/mochitest/runtestsremote.py --autorun --close-when-done \
--console-level=INFO --log-file=./$@.log --file-level=INFO $(DM_FLAGS) \
--console-level=INFO --log-file=./$@.log --file-level=INFO $(DM_FLAGS) --dm_trans=$(DM_TRANS) \
--app=$(ANDROID_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \
$(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
@ -81,8 +81,9 @@ define CHECK_TEST_ERROR
endef
endif
mochitest-remote: DM_TRANS?=adb
mochitest-remote:
if test -f ${MOZ_HOST_BIN}/xpcshell && [ "${TEST_DEVICE}" != "" ]; \
if test -f ${MOZ_HOST_BIN}/xpcshell && [ "${TEST_DEVICE}" != "usb" -o "$(DM_TRANS)" = "adb" ]; \
then $(RUN_MOCHITEST_REMOTE); \
else \
@echo "please prepare your host with environment variables for TEST_DEVICE and MOZ_HOST_BIN"; \
@ -148,7 +149,7 @@ reftest:
reftest-remote: TEST_PATH?=layout/reftests/reftest.list
reftest-remote: DM_TRANS?=adb
reftest-remote:
@if test -f ${MOZ_HOST_BIN}/xpcshell -a ("${TEST_DEVICE}" != "" -o "$DM_TRANS" = "adb") ; \
@if test -f ${MOZ_HOST_BIN}/xpcshell && [ "${TEST_DEVICE}" != "" -o "$(DM_TRANS)" = "adb" ]; \
then ln -s $(abspath $(topsrcdir)) _tests/reftest/tests;$(call REMOTE_REFTEST,tests/$(TEST_PATH)); $(CHECK_TEST_ERROR); \
else \
echo "please prepare your host with environment variables for TEST_DEVICE and MOZ_HOST_BIN"; \