ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 19:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- remove obsolete pid option

Browse Source 
svn path=/trunk/; revision=27661
This commit is contained in:
Johannes Anderwald
2007-07-14 15:10:17 +00:00
parent 06fbf99e3f
commit 47dc768408
6 changed files with 11 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/tools/sysreg/rosboot_test.cpp
+4 -31
View File
@@ -65,22 +65,6 @@ namespace Sysreg_
{
}
//---------------------------------------------------------------------------------------
void RosBootTest::getPidFromFile()
{
FileReader file;
if (file.openSource(m_PidFile.c_str ()))
{
vector<string> lines;
file.readSource(lines);
if (lines.size() == 1)
{
string line = lines[0];
m_Pid = _ttoi(line.c_str ());
}
file.closeSource();
}
}
//---------------------------------------------------------------------------------------
bool RosBootTest::executeBootCmd()
{
@@ -201,7 +185,7 @@ namespace Sysreg_
return false;
}
string timeout;
string timeout;
if (conf_parser.getStringValue(RosBootTest::TIME_OUT, timeout))
{
TCHAR * stop;
@@ -213,20 +197,8 @@ namespace Sysreg_
m_Timeout = 60.0;
}
}
if (m_DebugPort.find(_T("pipe")) != string::npos)
{
#ifdef __LINUX__
if (!conf_parser.getStringValue (RosBootTest::PID_FILE, m_PidFile))
{
cerr << "Error: linux hosts must provide pid file option" << endl;
return false;
}
_tremove(m_PidFile.c_str ());
#endif
}
string delayread;
string delayread;
if (conf_parser.getStringValue(RosBootTest::DELAY_READ, delayread))
{
TCHAR * stop;
@@ -340,7 +312,8 @@ namespace Sysreg_
if (line.find (RosBootTest::SYSREG_CHECKPOINT) != string::npos)
{
line.erase (0, line.find (RosBootTest::SYSREG_CHECKPOINT) + RosBootTest::SYSREG_CHECKPOINT.length ());
line.erase (0, line.find (RosBootTest::SYSREG_CHECKPOINT) +
RosBootTest::SYSREG_CHECKPOINT.length ());
if (!_tcsncmp(line.c_str (), m_Checkpoint.c_str (), m_Checkpoint.length ()))
{
state = DebugStateCPReached;
reactos/tools/sysreg/rosboot_test.h
+7 -8
View File
@@ -122,19 +122,18 @@ typedef enum DebugState
protected:
double m_Timeout;
string m_PidFile;
string m_Checkpoint;
string m_CriticalApp;
string m_DebugFile;
string m_BootCmd;
string m_DebugPort;
string m_Pipe;
string m_File;
DataSource * m_DataSource;
string m_BootCmd;
string m_DebugPort;
string m_Pipe;
string m_File;
DataSource * m_DataSource;
vector <string> m_Checkpoints;
unsigned long m_Delayread;
long m_Pid;
long m_DelayRead;
long m_Pid;
long m_DelayRead;
}; // end of class RosBootTest
reactos/tools/sysreg/runonce.cfg
-8
View File
@@ -29,14 +29,6 @@ ROS_ADDR2LINE=addr2line.exe --exe=
ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot c -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -pidfile pid.txt
;
; ROSBOOT_PIDFILE
;
; This option stores the pid of the emulator process in a text file.
;
ROSBOOT_PID_FILE=pid.txt
;
; ROSBOOT_DEBUG_PORT
;
reactos/tools/sysreg/sample.cfg
-8
View File
@@ -29,14 +29,6 @@ ROS_ADDR2LINE=addr2line.exe --exe=
ROSBOOT_CMD=D:\sysreg\qemu\qemu.exe -serial pipe:qemu -boot c -m 128 -L D:\sysreg\qemu\ D:\sysreg\qemu\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt
;
; ROSBOOT_PIDFILE
;
; This option stores the pid of the emulator process in a text file.
;
ROSBOOT_PID_FILE=pid.txt
;
; ROSBOOT_DEBUG_PORT
;
reactos/tools/sysreg/secstage.cfg
-8
View File
@@ -29,14 +29,6 @@ ROS_ADDR2LINE=addr2line.exe --exe=
ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot c -m 128 -L D:\reactos\qemu\ D:\reactos\RosVM.vmdk -pidfile pid.txt
;
; ROSBOOT_PIDFILE
;
; This option stores the pid of the emulator process in a text file.
;
ROSBOOT_PID_FILE=pid.txt
;
; ROSBOOT_DEBUG_PORT
;
reactos/tools/sysreg/txtmode.cfg
-8
View File
@@ -31,14 +31,6 @@ ROS_ADDR2LINE=addr2line.exe --exe=
ROSBOOT_CMD=/usr/bin/qemu -serial file:/home/freenet/reactos/tools/sysreg/txtmode.log -boot d -m 64 -L /home/freenet/reactos/qemu /home/freenet/reactos/qemu/c.img -cdrom /home/freenet/reactos/ReactOS.iso
;
; ROSBOOT_PIDFILE
;
; This option stores the pid of the emulator process in a text file.
;
ROSBOOT_PID_FILE=pid.txt
;
; ROSBOOT_DEBUG_PORT
;