thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3823 from unknownbrackets/headless

Browse source 
Fix headless on buildbot (command line length), speed up further
This commit is contained in:
Henrik Rydgård 2013-09-18 00:48:17 -07:00
commit 198434c6eb
7 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
headless/Headless.cpp
View file

@ -123,7 +123,7 @@ bool RunAutoTest(HeadlessHost *headlessHost, CoreParameter &coreParameter, bool
fprintf(stderr, "Failed to start %s. Error: %s\n", coreParameter.fileToStart.c_str(), error_string.c_str());
printf("TESTERROR\n");
TeamCityPrint("##teamcity[testIgnored name='%s' message='PRX/ELF missing']\n", teamCityName.c_str());
return 1;
return false;
}
TeamCityPrint("##teamcity[testStarted name='%s' captureStandardOutput='true']\n", teamCityName.c_str());
@ -160,7 +160,6 @@ bool RunAutoTest(HeadlessHost *headlessHost, CoreParameter &coreParameter, bool
}
}
host->ShutdownGL();
PSP_Shutdown();
headlessHost->FlushDebugOutput();
@ -242,6 +241,17 @@ int main(int argc, const char* argv[])
testFilenames.push_back(argv[i]);
}
// TODO: Allow a filename here?
if (testFilenames.size() == 1 && testFilenames[0] == "@-")
{
testFilenames.clear();
char temp[2048];
temp[2047] = '\0';
while (scanf("%2047s", temp) == 1)
testFilenames.push_back(temp);
}
if (readMount)
{
printUsage(argv[0], "Missing argument after -m");
@ -357,10 +367,10 @@ int main(int argc, const char* argv[])
}
}
host->ShutdownGL();
delete host;
host = NULL;
headlessHost = NULL;
return 0;
}