diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-01-08 13:40:59 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-01-08 13:40:59 -0600 |
| commit | 954ebaed84f934437fc3a18c937f08fc527359e3 (patch) | |
| tree | 93f6d2c12a93045db66337bdb17167f0b312b785 /indra/test | |
| parent | 716e2ea3b1e25ac8da64343d02310e8f086c48e7 (diff) | |
| parent | b601bc3cbf5e999b4fd0b0b9ae024397b92cce39 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/lluuidhashmap_tut.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/test/lluuidhashmap_tut.cpp b/indra/test/lluuidhashmap_tut.cpp index 408bc3faf1..9712a613f4 100644 --- a/indra/test/lluuidhashmap_tut.cpp +++ b/indra/test/lluuidhashmap_tut.cpp @@ -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; |