[ros-diffs] [janderwald] 27662: - add terminate emulator option :)

[janderwald at svn.reactos.org]

Author: janderwald
Date: Sat Jul 14 19:23:56 2007
New Revision: 27662

URL: http://svn.reactos.org/svn/reactos?rev=27662&view=rev
Log:
- add terminate emulator option :)

Modified:
    trunk/reactos/tools/sysreg/rosboot_test.cpp
    trunk/reactos/tools/sysreg/rosboot_test.h
    trunk/reactos/tools/sysreg/sample.cfg

Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.cpp?rev=27662&r1=27661&r2=27662&view=diff
==============================================================================
--- trunk/reactos/tools/sysreg/rosboot_test.cpp (original)
+++ trunk/reactos/tools/sysreg/rosboot_test.cpp Sat Jul 14 19:23:56 2007
@@ -53,6 +53,7 @@
 	string RosBootTest::CHECK_POINT = _T("ROSBOOT_CHECK_POINT");
 	string RosBootTest::SYSREG_CHECKPOINT = _T("SYSREG_CHECKPOINT:");
 	string RosBootTest::CRITICAL_APP = _T("ROSBOOT_CRITICAL_APP");
+	string RosBootTest::TERMINATE_EMULATOR = _T("ROSBOOT_TERMINATE_EMULATOR");
 
 //---------------------------------------------------------------------------------------
 	RosBootTest::RosBootTest() : m_Timeout(60.0), m_Delayread(0)
@@ -217,6 +218,7 @@
 		conf_parser.getStringValue (RosBootTest::CHECK_POINT, m_Checkpoint);
 		conf_parser.getStringValue (RosBootTest::CRITICAL_APP, m_CriticalApp);
 		conf_parser.getStringValue (RosBootTest::DEBUG_FILE, m_DebugFile);
+		conf_parser.getStringValue (RosBootTest::TERMINATE_EMULATOR, m_KillEmulator);
 
         return true;
     }
@@ -273,14 +275,16 @@
         bool ret = analyzeDebugData();
 
         m_DataSource->closeSource();
-        OsSupport::sleep(3 * CLOCKS_PER_SEC);
-        if (m_Pid)
-        {
+	if (m_KillEmulator == "yes")
+	{
+        	OsSupport::sleep(3 * CLOCKS_PER_SEC);
+        	if (m_Pid)
+        	{
 		    OsSupport::terminateProcess (m_Pid);
-        }
-
-		return ret;
-	}
+        	}
+        }
+	return ret;
+}
 //---------------------------------------------------------------------------------------
 	void RosBootTest::dumpCheckpoints()
 	{

Modified: trunk/reactos/tools/sysreg/rosboot_test.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.h?rev=27662&r1=27661&r2=27662&view=diff
==============================================================================
--- trunk/reactos/tools/sysreg/rosboot_test.h (original)
+++ trunk/reactos/tools/sysreg/rosboot_test.h Sat Jul 14 19:23:56 2007
@@ -40,6 +40,7 @@
 		static string SYSREG_CHECKPOINT;
 		static string DELAY_READ;
 		static string CRITICAL_APP;
+		static string TERMINATE_EMULATOR;
 
 //---------------------------------------------------------------------------------------
 ///
@@ -129,6 +130,7 @@
 	string m_DebugPort;
 	string m_Pipe;
 	string m_File;
+	string m_KillEmulator;
 	DataSource * m_DataSource;
 	vector <string> m_Checkpoints;
 	unsigned long m_Delayread;

Modified: trunk/reactos/tools/sysreg/sample.cfg
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sample.cfg?rev=27662&r1=27661&r2=27662&view=diff
==============================================================================
--- trunk/reactos/tools/sysreg/sample.cfg (original)
+++ trunk/reactos/tools/sysreg/sample.cfg Sat Jul 14 19:23:56 2007
@@ -27,7 +27,7 @@
 ; This value is the command which is executed to gain debugging data
 ; 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_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 -
 
 ;
 ; ROSBOOT_DEBUG_PORT
@@ -103,3 +103,9 @@
 ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe
 ;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe lsass.exe
 
+;ROSBOOT_TERMINATE_EMULATOR
+;
+; Terminate the emulator when sysreg exits, default no
+;
+;ROSBOOT_TERMINATE_EMULATOR=no
+ROSBOOT_TERMINATE_EMULATOR=yes