Bug 1217144: Allow for cppunittest to be run locally on OSX. r=erahm
authorStephen A Pohl <spohl.mozilla.bugs@gmail.com>
Tue, 27 Oct 2015 13:50:56 -0400
changeset 269860 5a079ae0c95043629628f0daaaacae92454c8086
parent 269859 393566e4fd28e3a55bb3d553b227859c0fb6ded5
child 269861 bb3212ad29e2bb442af84267f366f385ae3e98a6
push idunknown
push userunknown
push dateunknown
reviewerserahm
bugs1217144
milestone44.0a1
Bug 1217144: Allow for cppunittest to be run locally on OSX. r=erahm
testing/mozharness/configs/unittests/mac_unittest.py
testing/runcppunittests.py
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -45,17 +45,17 @@ config = {
         "jittest": ["jit-test/*"],
         "mozbase": ["mozbase/*"],
         "mozmill": ["mozmill/*"],
     },
     "suite_definitions": {
         "cppunittest": {
             "options": [
                 "--symbols-path=%(symbols_path)s",
-                "--xre-path=%(abs_app_dir)s"
+                "--xre-path=%(abs_res_dir)s"
             ],
             "run_filename": "runcppunittests.py",
             "testsdir": "cppunittest"
         },
         "jittest": {
             "options": [
                 "tests/bin/js",
                 "--no-slow",
--- a/testing/runcppunittests.py
+++ b/testing/runcppunittests.py
@@ -232,18 +232,16 @@ def update_mozinfo():
         dirs.add(path)
         path = os.path.split(path)[0]
     mozinfo.find_and_update_from_json(*dirs)
 
 def run_test_harness(options, args):
     update_mozinfo()
     progs = extract_unittests_from_args(args, mozinfo.info, options.manifest_path)
     options.xre_path = os.path.abspath(options.xre_path)
-    if mozinfo.isMac:
-        options.xre_path = os.path.join(os.path.dirname(options.xre_path), 'Resources')
     tester = CPPUnitTests()
     result = tester.run_tests(progs, options.xre_path, options.symbols_path)
 
     return result
 
 def main():
     parser = CPPUnittestOptions()
     mozlog.commandline.add_logging_group(parser)