[Box Backup-commit] COMMIT r1774 - box/chris/merge/test/common

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-07-26 23:07:24 +0100 (Thu, 26 Jul 2007)
New Revision: 1774

Modified:
   box/chris/merge/test/common/testcommon.cpp
Log:
Fix regex tests for HAVE_REGEX_SUPPORT. (refs #3, merges [1682])


Modified: box/chris/merge/test/common/testcommon.cpp
===================================================================
--- box/chris/merge/test/common/testcommon.cpp	2007-07-26 22:06:52 UTC (rev 1773)
+++ box/chris/merge/test/common/testcommon.cpp	2007-07-26 22:07:24 UTC (rev 1774)
@@ -750,7 +750,7 @@
 		TEST_THAT(elist.SizeOfDefiniteList() == 4);
 
 		// Add regex entries
-		#ifdef HAVE_REGEX_H
+		#ifdef HAVE_REGEX_SUPPORT
 			elist.AddRegexEntries(std::string("[a-d]+\\.reg$" "\x01" "EXCLUDE" "\x01" "^exclude$"));
 			elist.AddRegexEntries(std::string(""));
 			TEST_CHECK_THROWS(elist.AddRegexEntries(std::string("[:not_valid")), CommonException, BadRegularExpression);
@@ -782,7 +782,7 @@
 		TEST_THAT(elist.IsExcluded("thingdefthree") 
 			== !CASE_SENSITIVE);
 
-		#ifdef HAVE_REGEX_H
+		#ifdef HAVE_REGEX_SUPPORT
 			TEST_THAT(elist.IsExcluded(std::string("b.reg")) == true);
 			TEST_THAT(elist.IsExcluded(std::string("B.reg")) == !CASE_SENSITIVE);
 			TEST_THAT(elist.IsExcluded(std::string("b.Reg")) == !CASE_SENSITIVE);