Skip to content
Snippets Groups Projects
Commit 64e3352a authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

MAINT-1986: merge in TeamCity check in hashmap_test

parents 205f77e0 8a2c30b3
No related branches found
No related tags found
No related merge requests found
...@@ -117,9 +117,10 @@ namespace tut ...@@ -117,9 +117,10 @@ namespace tut
std::string savefile(gDirUtilp->add(tempdir, "lluuidhashmap_tut.save.txt")); std::string savefile(gDirUtilp->add(tempdir, "lluuidhashmap_tut.save.txt"));
const int numElementsToCheck = 32*256*32; const int numElementsToCheck = 32*256*32;
std::vector<LLUUID> idList; 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()); std::ifstream inf(savefile.c_str());
if (! inf.is_open()) if (! inf.is_open())
{ {
...@@ -139,8 +140,8 @@ namespace tut ...@@ -139,8 +140,8 @@ namespace tut
} }
else else
{ {
// savefile does not exist (normal case): regenerate idList from // This is a TeamCity build, or (normal case) savefile does not
// scratch. // exist: regenerate idList from scratch.
for (int i = 0; i < numElementsToCheck; ++i) for (int i = 0; i < numElementsToCheck; ++i)
{ {
LLUUID id; LLUUID id;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment