Bug 1413668: Don't hardcode objdir in LD_LIBRAY_PATH. draft
authorTom Prince <mozilla@hocat.ca>
Mon, 30 Oct 2017 12:03:51 -0600
changeset 698718 56db1baacf439a7564b1d77af60a7a8ebc4a8a1b
parent 698717 46725bf82fb2e5dc9cbcd623215d929cc1e9c51f
child 698719 b441cdab06b4b76f2b7c4d56acc841664025c874
child 698724 eb2e5623573d61586e9ddbedb09ccf62858a760f
push id89335
push userbmo:mozilla@hocat.ca
push dateThu, 16 Nov 2017 01:10:42 +0000
bugs1413668
milestone59.0a1
Bug 1413668: Don't hardcode objdir in LD_LIBRAY_PATH. MozReview-Commit-ID: GSSFFkaErJb
testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
@@ -28,16 +28,15 @@ config = {
         'CCACHE_DIR': '/builds/ccache',
         'CCACHE_COMPRESS': '1',
         'CCACHE_UMASK': '002',
         'LC_ALL': 'C',
         # 32 bit specific
         'PATH': '/usr/local/bin:/usr/lib/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
-        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib:\
-%s/dist/bin' % (MOZ_OBJDIR,),
+        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:%(abs_obj_dir)s/dist/bin',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TINDERBOX_OUTPUT': '1',
     },
     'src_mozconfig': 'browser/config/mozconfigs/linux32/debug',
     #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
@@ -26,17 +26,16 @@ config = {
         'CCACHE_DIR': '/builds/ccache',
         'CCACHE_COMPRESS': '1',
         'CCACHE_UMASK': '002',
         'LC_ALL': 'C',
         # 32 bit specific
         'PATH': '/usr/local/bin:/usr/lib/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
-        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib:\
-%s/dist/bin' % (MOZ_OBJDIR,),
+        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:%(abs_obj_dir)s/dist/bin',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TINDERBOX_OUTPUT': '1',
     },
     'src_mozconfig': 'browser/config/mozconfigs/linux32/rusttests',
     'artifact_flag_build_variant_in_try': None,
     #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
@@ -27,17 +27,16 @@ config = {
         'CCACHE_DIR': '/builds/ccache',
         'CCACHE_COMPRESS': '1',
         'CCACHE_UMASK': '002',
         'LC_ALL': 'C',
         # 32 bit specific
         'PATH': '/usr/local/bin:/usr/lib/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
-        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib:\
-%s/dist/bin' % (MOZ_OBJDIR,),
+        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:%(abs_obj_dir)s/dist/bin',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TINDERBOX_OUTPUT': '1',
     },
     'src_mozconfig': 'browser/config/mozconfigs/linux32/rusttests-debug',
     'artifact_flag_build_variant_in_try': None,
     #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
@@ -29,15 +29,14 @@ config = {
         'CCACHE_COMPRESS': '1',
         'CCACHE_UMASK': '002',
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         # 64 bit specific
         'PATH': '/usr/local/bin:/usr/lib64/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
-        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:\
-%s/dist/bin' % (MOZ_OBJDIR,),
+        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:%(abs_obj_dir)s/dist/bin',
         'TINDERBOX_OUTPUT': '1',
     },
     'src_mozconfig': 'browser/config/mozconfigs/linux64/debug',
     #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py
@@ -28,14 +28,13 @@ config = {
         'CCACHE_COMPRESS': '1',
         'CCACHE_UMASK': '002',
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         # 64 bit specific
         'PATH': '/usr/local/bin:/usr/lib64/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
-        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:\
-%s/dist/bin' % (MOZ_OBJDIR,),
+        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:%(abs_obj_dir)s/dist/bin',
         'TINDERBOX_OUTPUT': '1',
     },
     'src_mozconfig': 'browser/config/mozconfigs/linux64/noopt-debug',
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
@@ -27,15 +27,14 @@ config = {
         'CCACHE_COMPRESS': '1',
         'CCACHE_UMASK': '002',
         'LC_ALL': 'C',
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         # 64 bit specific
         'PATH': '/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
-        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:\
-%s/dist/bin' % (MOZ_OBJDIR,),
+        'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib64:%(abs_obj_dir)s/dist/bin',
         'TINDERBOX_OUTPUT': '1',
     },
     'src_mozconfig': 'browser/config/mozconfigs/linux64/rusttests-debug',
     'artifact_flag_build_variant_in_try': None,
 }