- always wait and then kill the emulator

svn path=/trunk/; revision=28640
This commit is contained in:
Johannes Anderwald 2007-08-28 22:48:40 +00:00
parent f918874665
commit 247523e709
2 changed files with 12 additions and 18 deletions

View file

@ -526,17 +526,14 @@ namespace Sysreg_
//---------------------------------------------------------------------------------------
void RosBootTest::cleanup()
{
m_DataSource->closeSource();
if (m_KillEmulator == "yes")
{
OsSupport::sleep(3 * CLOCKS_PER_SEC);
if (m_Pid)
{
OsSupport::terminateProcess (m_Pid);
}
}
m_DataSource->closeSource();
OsSupport::sleep(3 * CLOCKS_PER_SEC);
if (m_Pid)
{
OsSupport::terminateProcess (m_Pid);
}
delete m_DataSource;
m_DataSource = NULL;
}
//---------------------------------------------------------------------------------------
@ -819,7 +816,7 @@ namespace Sysreg_
if (!m_DataSource->readSource (vect))
{
cerr << "No data read" << endl;
cerr << "No data read" << GetLastError() << endl;
continue;
}
if (write_log)

View file

@ -10,17 +10,14 @@ ROS_EMU_TYPE=qemu
;
; This variable sets the path to the emulator
;
ROS_EMU_PATH=/usr/bin/qemu
;ROS_EMU_PATH=E:\reactos\qemu\qemu.exe
ROS_EMU_PATH=E:\reactos\qemu\qemu.exe
; ROS_HDD_IMAGE
;
; The hdd image to use for running the emulator. If this variable is not
; set, SysReg will create a HDD with name "ros.hd" in the ROS_OUTPUT
; directory using the qemu-img tool. It will search
; set, SysReg will create a HDD with name "ros.img" using the qemu-img tool. It will search
; this tool in the directory of emulator and abort if the tool cannot be found
ROS_HDD_IMAGE=~/reactos/qemu/ReactOS.hd
;ROS_HDD_IMAGE=E:\reactos\qemu\ReactOS.hd
; ROS_CD_IMAGE
@ -29,8 +26,8 @@ ROS_HDD_IMAGE=~/reactos/qemu/ReactOS.hd
; an ReactOS unattended installation disk. If this variable is not set, SysReg lets the emulator boot
; from harddisk.
;
ROS_CD_IMAGE=~/reactos/qemu/bootcd.iso
;ROS_CD_IMAGE=E:\reactos\qemu\Reactos.iso
;ROS_CD_IMAGE=E:\reactos\qemu\Reactos-Regtest.iso
;-------------------------------------------------------------------------------------------
; Additional Options