livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-1986: merge in TeamCity check in hashmap_test

meow-7.2.2
Nat Goodspeed 2012-12-19 06:42:50 -05:00
parent 205f77e035 8a2c30b388
commit 64e3352aa1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/test/lluuidhashmap_tut.cpp
View File

@ -117,9 +117,10 @@ namespace tut
std::string savefile(gDirUtilp->add(tempdir, "lluuidhashmap_tut.save.txt"));
const int numElementsToCheck = 32*256*32;
std::vector<LLUUID> idList;
if (gDirUtilp->fileExists(savefile))
if ((! getenv("TEAMCITY_PROJECT_NAME")) && gDirUtilp->fileExists(savefile))
{
// We have saved data from a previous failed run. Reload that data.
// This is not a TeamCity build, and we have saved data from a
// previous failed run. Reload that data.
std::ifstream inf(savefile.c_str());
if (! inf.is_open())
{
@ -139,8 +140,8 @@ namespace tut
}
else
{
// savefile does not exist (normal case): regenerate idList from
// scratch.
// This is a TeamCity build, or (normal case) savefile does not
// exist: regenerate idList from scratch.
for (int i = 0; i < numElementsToCheck; ++i)
{
LLUUID id;