mirror of
https://github.com/reactos/reactos.git
synced 2024-10-02 07:26:47 +00:00
[ROSAUTOTEST]
- Check the environment variable ROSAUTOTEST_DIR for an alternative path to the test executables. Otherwise use the default %windir%\bin - Update the URL of the web service svn path=/trunk/; revision=66481
This commit is contained in:
parent
d3ee77adf9
commit
8d14ace200
|
@ -2,13 +2,13 @@
|
|||
* PROJECT: ReactOS Automatic Testing Utility
|
||||
* LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation
|
||||
* PURPOSE: Class implementing the interface to the "testman" Web Service
|
||||
* COPYRIGHT: Copyright 2009-2011 Colin Finck <colin@reactos.org>
|
||||
* COPYRIGHT: Copyright 2009-2015 Colin Finck <colin@reactos.org>
|
||||
*/
|
||||
|
||||
#include "precomp.h"
|
||||
|
||||
static const WCHAR szHostname[] = L"reactos.org";
|
||||
static const WCHAR szServerFile[] = L"testman/webservice/";
|
||||
static const WCHAR szServerFile[] = L"sites/all/modules/reactos/testman/webservice/";
|
||||
|
||||
/**
|
||||
* Constructs a CWebService object and immediately establishes a connection to the "testman" Web Service.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* PROJECT: ReactOS Automatic Testing Utility
|
||||
* LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation
|
||||
* PURPOSE: Class implementing functions for handling Wine tests
|
||||
* COPYRIGHT: Copyright 2009 Colin Finck <colin@reactos.org>
|
||||
* COPYRIGHT: Copyright 2009-2015 Colin Finck <colin@reactos.org>
|
||||
*/
|
||||
|
||||
#include "precomp.h"
|
||||
|
@ -13,20 +13,26 @@ static const DWORD ListTimeout = 10000;
|
|||
* Constructs a CWineTest object.
|
||||
*/
|
||||
CWineTest::CWineTest()
|
||||
: m_hFind(NULL), m_ListBuffer(NULL)
|
||||
{
|
||||
WCHAR WindowsDirectory[MAX_PATH];
|
||||
|
||||
/* Zero-initialize variables */
|
||||
m_hFind = NULL;
|
||||
m_ListBuffer = NULL;
|
||||
WCHAR wszDirectory[MAX_PATH];
|
||||
|
||||
/* Set up m_TestPath */
|
||||
if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH))
|
||||
if (GetEnvironmentVariableW(L"ROSAUTOTEST_DIR", wszDirectory, MAX_PATH))
|
||||
{
|
||||
m_TestPath = wszDirectory;
|
||||
if (*m_TestPath.rbegin() != L'\\')
|
||||
m_TestPath += L'\\';
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!GetWindowsDirectoryW(wszDirectory, MAX_PATH))
|
||||
FATAL("GetWindowsDirectoryW failed");
|
||||
|
||||
m_TestPath = WindowsDirectory;
|
||||
m_TestPath = wszDirectory;
|
||||
m_TestPath += L"\\bin\\";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Destructs a CWineTest object.
|
||||
|
|
Loading…
Reference in a new issue