From 0ecb46bf4660b1bab8fa31e4dadfd2e31fa6c7a9 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 2 Nov 2010 16:16:48 -0400
Subject: [PATCH] STORM-477 fix for test code - intermediate checkin to trigger
Windows test on TeamCity
--HG--
branch : storm-102
---
indra/llvfs/tests/lldir_test.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/indra/llvfs/tests/lldir_test.cpp b/indra/llvfs/tests/lldir_test.cpp
index d76823b4092..30976e76618 100644
--- a/indra/llvfs/tests/lldir_test.cpp
+++ b/indra/llvfs/tests/lldir_test.cpp
@@ -289,7 +289,7 @@ namespace tut
static const char* DirScanFilename[5] = { "file1.abc", "file2.abc", "file1.xyz", "file2.xyz", "file1.mno" };
- void scanTest(const std::string directory, const std::string pattern, bool correctResult[5])
+ void scanTest(const std::string& directory, const std::string& pattern, bool correctResult[5])
{
// Scan directory and see if any file1.* files are found
@@ -314,7 +314,7 @@ namespace tut
}
else // check is 5 - should not happen
{
- ensure( "found unknown file '"+(std::string)DirScanFilename[check]+"'", false);
+ fail( "found unknown file '"+scanResult+"'");
}
}
for (int i=0; i<5; i++)
@@ -380,7 +380,6 @@ namespace tut
// Scan dir2 and see if any file?.??c files are found - THESE FAIL AND SO ARE COMMENTED OUT FOR NOW
// bool expected8[5] = { true, true, false, false, false };
// scanTest(dir2, "file?.??c", expected8);
- // bool expected8[5] = { true, true, false, false, false };
// scanTest(dir2, "*.??c", expected8);
// Scan dir1 and see if any *.?n? files are found
--
GitLab