Bug 1160662 - Refer to robocop.ini in $OBJDIR/_tests, not $OBJDIR. r=margaret
authorNick Alexander <nalexander@mozilla.com>
Fri, 01 May 2015 14:51:27 -0700
changeset 273498 a813c4e53c62b49b6f3d8506a87214b520a7c104
parent 273497 db3c12a86b66cd04fd701b20f6208f955f2bf3f1
child 273499 fd9158e97d8135b7094471e96ebd9dc8cf3706d8
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret
bugs1160662
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1160662 - Refer to robocop.ini in $OBJDIR/_tests, not $OBJDIR. r=margaret
testing/mochitest/mach_commands.py
testing/testsuite-targets.mk
--- a/testing/mochitest/mach_commands.py
+++ b/testing/mochitest/mach_commands.py
@@ -1117,19 +1117,19 @@ class AndroidCommands(MachCommandBase):
                 self.topobjdir,
                 'build',
                 'mobile',
                 'robocop',
                 'robocop-debug.apk'),
             '--robocop-ini=' +
             os.path.join(
                 self.topobjdir,
-                'build',
-                'mobile',
-                'robocop',
+                '_tests',
+                'testing',
+                'mochitest',
                 'robocop.ini'),
             '--log-mach=-',
         ]
 
         if test_path:
             args.append('--test-path=%s' % test_path)
 
         mochitest = self._spawn(MochitestRunner)
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -61,17 +61,17 @@ RUN_MOCHITEST_REMOTE = \
     --testing-modules-dir=$(abspath _tests/modules) \
     $(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
 
 RUN_MOCHITEST_ROBOCOP = \
   rm -f ./$@.log && \
   $(PYTHON) _tests/testing/mochitest/runtestsremote.py \
     --robocop-apk=$(DEPTH)/build/mobile/robocop/robocop-debug.apk \
     --robocop-ids=$(DEPTH)/mobile/android/base/fennec_ids.txt \
-    --robocop-ini=$(DEPTH)/build/mobile/robocop/robocop.ini \
+    --robocop-ini=_tests/testing/mochitest/robocop.ini \
     --console-level=INFO --log-tbpl=./$@.log $(DM_FLAGS) --dm_trans=$(DM_TRANS) \
     --app=$(TEST_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \
     $(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
 
 ifndef NO_FAIL_ON_TEST_ERRORS
 define check_test_error_internal
   @errors=`grep 'TEST-UNEXPECTED-' $@.log` ;\
   if test "$$errors" ; then \