← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/sys_mgmt/codeTree.py

  • Committer: Brian Aker
  • Date: 2011-03-14 06:49:53 UTC
  • mfrom: (2232.1.2 dbqp_ld_preload_fix)
  • Revision ID: brian@tangent.org-20110314064953-73hw2ef0ej1e9td3
Merge in pcrews.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/sys_mgmt/codeTree.py
61
61
        self.basedir = self.system_manager.find_path([os.path.abspath(variables['basedir'])])
62
62
        self.source_dist = os.path.isdir(os.path.join(self.basedir, 'drizzled'))
63
63
        self.builddir = self.system_manager.find_path([os.path.abspath(self.basedir)])
 
64
        self.top_builddir = variables['topbuilddir']
64
65
        self.testdir = self.system_manager.find_path([os.path.abspath(variables['testdir'])])
65
66
        self.clientbindir = self.system_manager.find_path([os.path.join(self.builddir, 'client')
66
67
                                     , os.path.join(self.basedir, 'client')
153
154
        ld_lib_paths = []
154
155
        if self.source_dist:
155
156
            ld_lib_paths = [ os.path.join(self.basedir,"libdrizzleclient/.libs/")
156
 
                               , os.path.join(self.basedir,"mysys/.libs/")
157
 
                               , os.path.join(self.basedir,"mystrings/.libs/")
158
 
                               , os.path.join(self.basedir,"drizzled/.libs/")
159
 
                                                 , "/usr/local/lib"
160
 
                               ]
 
157
                           , os.path.join(self.basedir,"libdrizzle/.libs")
 
158
                           , os.path.join(self.basedir,"mysys/.libs/")
 
159
                           , os.path.join(self.basedir,"mystrings/.libs/")
 
160
                           , os.path.join(self.basedir,"drizzled/.libs/")
 
161
                                             , "/usr/local/lib"
 
162
                           ]
161
163
        else:
162
164
            ld_lib_paths = [ os.path.join(self.basedir,"lib")]
163
165
        return ld_lib_paths