diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-17 08:50:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-17 08:50:55 +0100 |
| commit | f408843f6bead8fd4168611db97593fb96bbf4be (patch) | |
| tree | bece217bcbd6d61035a985a4c007e08b1dd6e7f1 /searchlib | |
| parent | 26ca0169f7e45d545db0172b7301bd18613b0874 (diff) | |
| parent | fcbdb927720e0299da4e27fb25bd3cf16dd26cf8 (diff) | |
Merge pull request #26061 from vespa-engine/arnej/cosmetic-verify-rank-setup-fixes
cosmetic changes
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 | 7 |
2 files changed, 4 insertions, 7 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..864dd64b98f 100644 --- a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp +++ b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp @@ -134,11 +134,8 @@ struct Compiler : public Blueprint::DependencyHandler { failed_set.insert(feature_name); auto trace = make_trace(skip_self); vespalib::string msg; - if (trace.empty()) { - msg = fmt("invalid %s: %s", describe(feature_name).c_str(), reason.c_str()); - } else { - msg = fmt("invalid %s: %s\n%s", describe(feature_name).c_str(), reason.c_str(), trace.c_str()); - } + msg = fmt("invalid %s: %s\n%s", describe(feature_name).c_str(), reason.c_str(), trace.c_str()); + msg.chomp(); errors.emplace_back(msg); } probe_stack(); |