Stack usage differs with and without valgrind.., and possibly also OS version. Allow for both equality and regex error matching.

1 files changed, 51 insertions, 38 deletions

diff --git a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp
index 9b6669a86f7..5cb9974bf50 100644
--- a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp
+++ b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp
@@ -6,12 +6,24 @@
 #include <vespa/searchlib/features/valuefeature.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <regex>
 
 using namespace search::features;
 using namespace search::fef::test;
 using namespace search::fef;
 using vespalib::make_string_short::fmt;
 
+typedef bool (*cmp)(const vespalib::string & a, const vespalib::string &b);
+
+bool equal(const vespalib::string & a, const vespalib::string &b) {
+    return a == b;
+}
+
+bool regex(const vespalib::string & a, const vespalib::string &b) {
+    std::regex exp(b.c_str());
+    return std::regex_match(a.c_str(), exp);
+}
+
 struct RankFixture {
     BlueprintFactory factory;
     IndexEnvironment indexEnv;
@@ -21,13 +33,12 @@ struct RankFixture {
         factory.addPrototype(std::make_shared<ValueBlueprint>());
     }
 
-    bool verify(const std::string &feature, std::vector<vespalib::string> expected_errors) const {
+    bool verify(const std::string &feature, std::vector<std::pair<cmp, vespalib::string>> expected) const {
         std::vector<vespalib::string> errors;
         bool ok = verifyFeature(factory, indexEnv, feature, "feature verification test", errors);
-        EXPECT_EQUAL(errors.size(), expected_errors.size());
-        for (size_t i(0); i < std::min(errors.size(), expected_errors.size()); i++) {
-            EXPECT_EQUAL(errors[i].size(), expected_errors[i].size());
-            EXPECT_EQUAL(errors[i], expected_errors[i]);
+        EXPECT_EQUAL(errors.size(), expected.size());
+        for (size_t i(0); i < std::min(errors.size(), expected.size()); i++) {
+            EXPECT_TRUE(expected[i].first(errors[i], expected[i].second));
         }
         return ok;
     }
@@ -41,60 +52,62 @@ TEST_F("verify valid rank feature", RankFixture) {
 
 TEST_F("verify unknown feature", RankFixture) {
     EXPECT_FALSE(f1.verify("unknown",
-                           {"invalid rank feature 'unknown': unknown basename: 'unknown'",
-                            "verification failed: rank feature 'unknown' (feature verification test)"}));
+                           {{equal, "invalid rank feature 'unknown': unknown basename: 'unknown'"},
+                            {equal, "verification failed: rank feature 'unknown' (feature verification test)"}}));
 }
 
 TEST_F("verify unknown output", RankFixture) {
     EXPECT_FALSE(f1.verify("value(1, 2, 3).3",
-                           {"invalid rank feature 'value(1,2,3).3': unknown output: '3'",
-                            "verification failed: rank feature 'value(1, 2, 3).3' (feature verification test)"}));
+                           {{equal, "invalid rank feature 'value(1,2,3).3': unknown output: '3'"},
+                            {equal, "verification failed: rank feature 'value(1, 2, 3).3' (feature verification test)"}}));
 }
 
 TEST_F("verify illegal input parameters", RankFixture) {
     EXPECT_FALSE(f1.verify("value.0",
-                           {"invalid rank feature 'value.0': The parameter list used for setting up rank feature value is not valid: Expected 1+1x parameter(s), but got 0",
-                            "verification failed: rank feature 'value.0' (feature verification test)"}));
+                           {{equal, "invalid rank feature 'value.0': The parameter list used for setting up rank feature value is not valid: Expected 1+1x parameter(s), but got 0"},
+                            {equal, "verification failed: rank feature 'value.0' (feature verification test)"}}));
 }
 
 TEST_F("verify illegal feature name", RankFixture) {
     EXPECT_FALSE(f1.verify("value(2).",
-                           {"invalid rank feature 'value(2).': malformed name",
-                            "verification failed: rank feature 'value(2).' (feature verification test)"}));
+                           {{equal, "invalid rank feature 'value(2).': malformed name"},
+                            {equal, "verification failed: rank feature 'value(2).' (feature verification test)"}}));
 }
 
 TEST_F("verify too deep dependency graph", RankFixture) {
     EXPECT_TRUE(f1.verify("chain(basic, 255, 4)", {}));
     EXPECT_FALSE(f1.verify("chain(basic, 256, 4)",
-                           {"invalid rank feature 'value(4)': dependency graph too deep\n"
-                            "  ... needed by rank feature 'chain(basic,1,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,2,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,3,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,4,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,5,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,6,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,7,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,8,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,9,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,10,4)'\n"
-                            "  (skipped 241 entries)\n"
-                            "  ... needed by rank feature 'chain(basic,252,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,253,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,254,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,255,4)'\n"
-                            "  ... needed by rank feature 'chain(basic,256,4)'\n",
-                            "high stack usage: 360848 bytes",
-                            "verification failed: rank feature 'chain(basic, 256, 4)' (feature verification test)"}));
+                           {{equal,
+                             "invalid rank feature 'value(4)': dependency graph too deep\n"
+                             "  ... needed by rank feature 'chain(basic,1,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,2,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,3,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,4,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,5,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,6,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,7,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,8,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,9,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,10,4)'\n"
+                             "  (skipped 241 entries)\n"
+                             "  ... needed by rank feature 'chain(basic,252,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,253,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,254,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,255,4)'\n"
+                             "  ... needed by rank feature 'chain(basic,256,4)'\n"},
+                            {regex, "high stack usage: [0-9]+ bytes"},
+                            {equal, "verification failed: rank feature 'chain(basic, 256, 4)' (feature verification test)"}}));
 }
 
 TEST_F("verify dependency cycle", RankFixture) {
     EXPECT_FALSE(f1.verify("chain(cycle, 4, 2)",
-                           {"invalid rank feature 'chain(cycle,2,2)': dependency cycle detected\n"
-                            "  ... needed by rank feature 'chain(cycle,1,2)'\n"
-                            "  ... needed by rank feature 'chain(cycle,2,2)'\n"
-                            "  ... needed by rank feature 'chain(cycle,3,2)'\n"
-                            "  ... needed by rank feature 'chain(cycle,4,2)'\n",
-                            "verification failed: rank feature 'chain(cycle, 4, 2)' (feature verification test)"}));
+                           {{equal,
+                             "invalid rank feature 'chain(cycle,2,2)': dependency cycle detected\n"
+                             "  ... needed by rank feature 'chain(cycle,1,2)'\n"
+                             "  ... needed by rank feature 'chain(cycle,2,2)'\n"
+                             "  ... needed by rank feature 'chain(cycle,3,2)'\n"
+                             "  ... needed by rank feature 'chain(cycle,4,2)'\n"},
+                            {equal,"verification failed: rank feature 'chain(cycle, 4, 2)' (feature verification test)"}}));
 }
 
 TEST_MAIN() { TEST_RUN_ALL(); }