← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Lee Bieber
  • Date: 2011-01-29 18:51:46 UTC
  • mfrom: (2126.1.3 build)
  • Revision ID: kalebral@gmail.com-20110129185146-34jxm05igln9cxek
Merge Andrew - 709493: incorrect OUTER JOIN result when joined on unique key
Merge Patrick - Bug 708865: dbqp.py needs better naming for shared memory symlinks
Merge Patrick - Bug 708970: dbqp.py needs to process master.sh files
Merge Patrick - Bug 708979: need build target that uses dbqp.py to execute dtr test suite

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/sys_mgmt/system_management.py
34
34
import os
35
35
import sys
36
36
import shutil
 
37
import getpass
37
38
import commands
38
39
 
39
40
from lib.sys_mgmt.port_management import portManager
64
65
        self.no_shm = variables['noshm']
65
66
        self.shm_path = self.find_path(["/dev/shm", "/tmp"], required=0)
66
67
        self.cur_os = os.uname()[0]
67
 
        self.symlink_name = 'dtr_work_sym'
68
 
        self.workdir = variables['workdir']
 
68
        self.cur_user = getpass.getuser()
 
69
        self.symlink_name = 'dbqp_workdir_%s' %(self.cur_user)
 
70
        self.workdir = os.path.abspath(variables['workdir'])
 
71
        self.top_srcdir = os.path.abspath(variables['topsrcdir'])
 
72
        self.top_builddir = os.path.abspath(variables['topbuilddir'])
69
73
        self.start_dirty = variables['startdirty']
70
74
        self.valgrind = variables['valgrind']
71
75
        self.gdb = variables['gdb']
91
95
                                , 'LC_CTYPE' : ('C',0,0)
92
96
                                , 'LC_COLLATE' : ('C',0,0)
93
97
                                , 'USE_RUNNING_SERVER' : ("0",0,0)
94
 
                                , 'TOP_SRCDIR' : (self.code_tree.srcdir,0,0)
95
 
                                , 'TOP_BUILDDIR' : (self.code_tree.builddir,0,0)
 
98
                                , 'TOP_SRCDIR' : (self.top_srcdir,0,0)
 
99
                                , 'TOP_BUILDDIR' : (self.top_builddir,0,0)
96
100
                                , 'DRIZZLE_TEST_DIR' : (self.code_tree.testdir,0,0)
97
101
                                , 'DTR_BUILD_THREAD' : ("-69.5",0,0)
98
102
                                , 'LD_LIBRARY_PATH' : (self.ld_lib_paths,1,1)