diff host/tools/testtool/win32/RunTestsSheet.cpp @ 101:c37d3a9e1b28 ecos-sw-2000-06-16

Merge from eCos master repository on 2000-06-16-07:47:03-BST
author jlarmour
date Fri, 16 Jun 2000 16:43:59 +0000
parents 6736c52df507
children
line wrap: on
line diff
--- a/host/tools/testtool/win32/RunTestsSheet.cpp
+++ b/host/tools/testtool/win32/RunTestsSheet.cpp
@@ -69,7 +69,8 @@ CRunTestsSheet::CRunTestsSheet(LPCTSTR p
   m_nTimeout(900),
   m_nDownloadTimeout(120),
   m_nTimeoutType(TIMEOUT_AUTOMATIC),
-  m_nDownloadTimeoutType(TIMEOUT_AUTOMATIC),
+  m_nDownloadTimeoutType(TIMEOUT_SPECIFIED),
+  m_bRemote(false),
   m_bSerial(true),
   m_strPort(_T("COM1")),
   m_nBaud(38400),
@@ -288,7 +289,7 @@ void CRunTestsSheet::OnRun()
       m_ep=CeCosTest::ExecutionParameters(
         CeCosTest::ExecutionParameters::RUN,
         m_strTarget,
-        TIMEOUT_NONE==m_nTimeoutType?0x7fffffff:TIMEOUT_AUTOMATIC==m_nTimeoutType?0:1000*m_nTimeout,
+        TIMEOUT_NONE==m_nTimeoutType?0x7fffffff:TIMEOUT_AUTOMATIC==m_nTimeoutType?900000:1000*m_nTimeout,
         TIMEOUT_NONE==m_nDownloadTimeoutType?0x7fffffff:TIMEOUT_AUTOMATIC==m_nDownloadTimeoutType?0:1000*m_nDownloadTimeout);
       if(m_bRemote){
         CTestResource::SetResourceServer(CeCosSocket::HostPort(m_strResourceHost,m_nResourcePort));