← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/server_mgmt/drizzled.py

  • Committer: patrick crews
  • Date: 2011-02-11 23:56:37 UTC
  • mto: This revision was merged to the branch mainline in revision 2164.
  • Revision ID: gleebix@gmail.com-20110211235637-s2nuuhtj0sgebybp
Added in --gdb and --manual-gdb option as well as --drizzled option

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/server_mgmt/drizzled.py
61
61
 
62
62
        self.system_manager = self.server_manager.system_manager
63
63
        self.valgrind = self.system_manager.valgrind
 
64
        self.gdb = self.system_manager.gdb
64
65
        if self.valgrind:
65
66
            self.valgrind_time_buffer = 10
66
67
        else:
157
158
            as desired / intended
158
159
 
159
160
        """
160
 
      
161
 
        return "%s %s %s --mysql-protocol.port=%d --mysql-protocol.connect-timeout=60 --mysql-unix-socket-protocol.path=%s --pid-file=%s --drizzle-protocol.port=%d --datadir=%s --tmpdir=%s --innodb.data-file-path=ibdata1:20M:autoextend --sort-buffer-size=256K --max-heap-table-size=1M %s %s > %s 2>&1 & " % ( self.cmd_prefix
162
 
                                               , self.server_path
163
 
                                               , self.process_server_options()
164
 
                                               , self.master_port
165
 
                                               , self.socket_file
166
 
                                               , self.pid_file
167
 
                                               , self.drizzle_tcp_port
168
 
                                               , self.datadir
169
 
                                               , self.tmpdir
170
 
                                               , self.secure_file_string
171
 
                                               , self.user_string 
172
 
                                               , self.error_log
173
 
                                               )
 
161
 
 
162
        server_args = [ self.process_server_options()
 
163
                      , "--mysql-protocol.port=%d" %(self.master_port)
 
164
                      , "--mysql-protocol.connect-timeout=60"
 
165
                      , "--innodb.data-file-path=ibdata1:20M:autoextend"
 
166
                      , "--sort-buffer-size=256K"
 
167
                      , "--max-heap-table-size=1M"
 
168
                      , "--mysql-unix-socket-protocol.path=%s" %(self.socket_file)
 
169
                      , "--pid-file=%s" %(self.pid_file)
 
170
                      , "--drizzle-protocol.port=%d" %(self.drizzle_tcp_port)
 
171
                      , "--datadir=%s" %(self.datadir)
 
172
                      , "--tmpdir=%s" %(self.tmpdir)
 
173
                      , self.secure_file_string
 
174
                      , self.user_string
 
175
                      ]
 
176
 
 
177
        if self.gdb:
 
178
            server_args.append('--gdb')
 
179
            return self.system_manager.handle_gdb_reqs(self, server_args)
 
180
        else:
 
181
            return "%s %s %s & " % ( self.cmd_prefix
 
182
                                   , self.server_path
 
183
                                   , " ".join(server_args)
 
184
                                   )
 
185
 
174
186
 
175
187
    def get_stop_cmd(self):
176
188
        """ Return the command that will shut us down """