diff options
Diffstat (limited to 'searchlib')
| -rw-r--r-- | searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp | 4 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp | 3 |
2 files changed, 5 insertions, 2 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 50c089ce8dc..86097e8872a 100644 --- a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp +++ b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp @@ -110,7 +110,7 @@ TEST_F("verify too deep dependency graph", RankFixture) { " ... 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"}}, + " ... needed by rank feature chain(basic,256,4)"}}, {regex, {Level::WARNING, "high stack usage: [0-9]+ bytes"}}, {equal, {Level::ERROR, "verification failed: rank feature chain(basic, 256, 4) (feature verification test)"}}})); } @@ -123,7 +123,7 @@ TEST_F("verify dependency cycle", RankFixture) { " ... 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"}}, + " ... needed by rank feature chain(cycle,4,2)"}}, {equal, {Level::ERROR, "verification failed: rank feature chain(cycle, 4, 2) (feature verification test)"}}})); } diff --git a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp index cc2cae1c8cb..eb1876da45c 100644 --- a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp +++ b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp @@ -139,6 +139,9 @@ struct Compiler : public Blueprint::DependencyHandler { } else { msg = fmt("invalid %s: %s\n%s", describe(feature_name).c_str(), reason.c_str(), trace.c_str()); } + if (msg.rbegin()[0] == '\n') { + msg.pop_back(); + } errors.emplace_back(msg); } probe_stack(); |