diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-01-14 09:31:57 -0800 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-01-14 09:31:57 -0800 |
| commit | 4de7c27d9343d866a313ca16f3f102e2750ddb89 (patch) | |
| tree | a5a49491169f87a891a41e8916dcaa4e5c03302c /indra/test/lluuidhashmap_tut.cpp | |
| parent | deb4dfbae5aa72c8e688f214f2e806b2345b93c5 (diff) | |
| parent | cb676675335791d9dacd032c389a0346c725d9d7 (diff) | |
Merge in viewer-development
Diffstat (limited to 'indra/test/lluuidhashmap_tut.cpp')
| -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; |