Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-25 23:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ROSAUTOTEST] Add /t parameter for repeating tests

Browse source
This commit is contained in:
Victor Perevertkin 2020-05-18 05:42:53 +03:00 committed by Victor Perevertkin
parent 29b49c36ff
commit d230f8829c
3 changed files with 49 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/rostests/rosautotest/CConfiguration.cpp
View file

@ -19,6 +19,7 @@ CConfiguration::CConfiguration()
: m_CrashRecovery(false),
m_IsInteractive(false),
m_PrintToConsole(true),
m_RepeatCount(1),
m_Shutdown(false),
m_Submit(false)
{
@ -52,10 +53,17 @@ CConfiguration::ParseParameters(int argc, wchar_t* argv[])
{
if(argv[i][0] == '-' || argv[i][0] == '/')
{
unsigned long tmp_RepeatCount;
switch(argv[i][1])
{
case 'c':
++i;
if (i >= argc)
{
throw CInvalidParameterException();
}
m_Comment = UnicodeToAscii(argv[i]);
break;
@ -75,6 +83,23 @@ CConfiguration::ParseParameters(int argc, wchar_t* argv[])
m_Submit = true;
break;
case 't':
++i;
if (i >= argc)
{
throw CInvalidParameterException();
}
tmp_RepeatCount = wcstoul(argv[i], NULL, 10);
if (tmp_RepeatCount == 0 || tmp_RepeatCount > 10000)
{
throw CInvalidParameterException();
}
m_RepeatCount = tmp_RepeatCount;
break;
default:
throw CInvalidParameterException();
}

2
modules/rostests/rosautotest/CConfiguration.h
View file

@ -12,6 +12,7 @@ private:
bool m_IsInteractive;
bool m_IsReactOS;
bool m_PrintToConsole;
unsigned long m_RepeatCount;
bool m_Shutdown;
bool m_Submit;
string m_Comment;
@ -33,6 +34,7 @@ public:
bool DoSubmit() const { return m_Submit; }
bool IsInteractive() const { return m_IsInteractive; }
bool IsReactOS() const { return m_IsReactOS; }
unsigned long GetRepeatCount() const { return m_RepeatCount; }
const string& GetComment() const { return m_Comment; }
const wstring& GetModule() const { return m_Module; }
const string& GetTest() const { return m_Test; }

25
modules/rostests/rosautotest/main.cpp
View file

@ -28,6 +28,7 @@ IntPrintUsage()
<< " Can only be run under ReactOS and relies on sysreg2," << endl
<< " so incompatible with /w" << endl
<< " /s - Shut down the system after finishing the tests." << endl
<< " /t <num> - Repeat the test <num> times (1-10000)" << endl
<< " /w - Submit the results to the webservice." << endl
<< " Requires a \"rosautotest.ini\" with valid login data." << endl
<< " Incompatible with the /r option." << endl
@ -47,7 +48,6 @@ IntPrintUsage()
extern "C" int
wmain(int argc, wchar_t* argv[])
{
CWineTest WineTest;
int ReturnValue = 1;
try
@ -64,7 +64,7 @@ wmain(int argc, wchar_t* argv[])
<< "[ROSAUTOTEST] System uptime " << setprecision(2) << fixed;
ss << ((float)GetTickCount()/1000) << " seconds" << endl;
StringOut(ss.str());
/* Report tests startup */
InitLogs();
ReportEventW(hLog,
@ -77,8 +77,27 @@ wmain(int argc, wchar_t* argv[])
NULL,
NULL);
if (Configuration.GetRepeatCount() > 1)
{
stringstream ss1;
ss1 << "[ROSAUTOTEST] The test will be repeated " << Configuration.GetRepeatCount() << " times" << endl;
StringOut(ss1.str());
}
/* Run the tests */
WineTest.Run();
for (unsigned long i = 0; i < Configuration.GetRepeatCount(); i++)
{
CWineTest WineTest;
if (Configuration.GetRepeatCount() > 1)
{
stringstream ss;
ss << "[ROSAUTOTEST] Running attempt #" << i+1 << endl;
StringOut(ss.str());
}
WineTest.Run();
}
/* For sysreg2 */
DbgPrint("SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n");