14 Jul
2007
14 Jul
'07
3:10 p.m.
Author: janderwald
Date: Sat Jul 14 19:10:17 2007
New Revision: 27661
URL: http://svn.reactos.org/svn/reactos?rev=27661&view=rev
Log:
- remove obsolete pid option
Modified:
trunk/reactos/tools/sysreg/rosboot_test.cpp
trunk/reactos/tools/sysreg/rosboot_test.h
trunk/reactos/tools/sysreg/runonce.cfg
trunk/reactos/tools/sysreg/sample.cfg
trunk/reactos/tools/sysreg/secstage.cfg
trunk/reactos/tools/sysreg/txtmode.cfg
Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.…
==============================================================================
--- trunk/reactos/tools/sysreg/rosboot_test.cpp (original)
+++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sat Jul 14 19:10:17 2007
@@ -66,22 +66,6 @@
}
//---------------------------------------------------------------------------------------
- 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()
{
m_Pid = OsSupport::createProcess ((TCHAR*)m_BootCmd.c_str(), 0, NULL);
@@ -201,7 +185,7 @@
return false;
}
- string timeout;
+ string timeout;
if (conf_parser.getStringValue(RosBootTest::TIME_OUT, timeout))
{
TCHAR * stop;
@@ -213,20 +197,8 @@
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 @@
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;
Modified: trunk/reactos/tools/sysreg/rosboot_test.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.…
==============================================================================
--- trunk/reactos/tools/sysreg/rosboot_test.h (original)
+++ trunk/reactos/tools/sysreg/rosboot_test.h Sat Jul 14 19:10:17 2007
@@ -122,19 +122,18 @@
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
Modified: trunk/reactos/tools/sysreg/runonce.cfg
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/runonce.cfg?r…
==============================================================================
--- trunk/reactos/tools/sysreg/runonce.cfg (original)
+++ trunk/reactos/tools/sysreg/runonce.cfg Sat Jul 14 19:10:17 2007
@@ -28,14 +28,6 @@
; this value is mandatory
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
Modified: trunk/reactos/tools/sysreg/sample.cfg
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sample.cfg?re…
==============================================================================
--- trunk/reactos/tools/sysreg/sample.cfg (original)
+++ trunk/reactos/tools/sysreg/sample.cfg Sat Jul 14 19:10:17 2007
@@ -28,14 +28,6 @@
; this value is mandatory
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
Modified: trunk/reactos/tools/sysreg/secstage.cfg
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/secstage.cfg?…
==============================================================================
--- trunk/reactos/tools/sysreg/secstage.cfg (original)
+++ trunk/reactos/tools/sysreg/secstage.cfg Sat Jul 14 19:10:17 2007
@@ -28,14 +28,6 @@
; this value is mandatory
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
Modified: trunk/reactos/tools/sysreg/txtmode.cfg
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r…
==============================================================================
--- trunk/reactos/tools/sysreg/txtmode.cfg (original)
+++ trunk/reactos/tools/sysreg/txtmode.cfg Sat Jul 14 19:10:17 2007
@@ -30,14 +30,6 @@
;ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot d -m 128 -L
D:\reactos\qemu\ D:\reactos\RosVM.vmdk -cdrom ; D:\Reactos\ReactOS-RegTest.iso -pidfile
pid.txt
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