summaryrefslogtreecommitdiffstats
path: root/config-model/src/test/derived/inheritance
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2019-01-21 16:06:53 +0100
committerGitHub <noreply@github.com>2019-01-21 16:06:53 +0100
commit8372a883c5a5fa100f88fc9b80824359b5bb70cd (patch)
tree660ce3ef61f060b33bd97eac1185715606b8e2bd /config-model/src/test/derived/inheritance
parent3722c1cdd91fce30d1c2538b2a8749d9321e194b (diff)
parenteb0b1134a66507e3bd8f09793c22cd824d01dff5 (diff)
Merge pull request #8198 from vespa-engine/7
7 MERGEOK
Diffstat (limited to 'config-model/src/test/derived/inheritance')
-rw-r--r--config-model/src/test/derived/inheritance/ilscripts.cfg4
-rw-r--r--config-model/src/test/derived/inheritance/index-info.cfg4
2 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/test/derived/inheritance/ilscripts.cfg b/config-model/src/test/derived/inheritance/ilscripts.cfg
index 5856da6992e..91410489de8 100644
--- a/config-model/src/test/derived/inheritance/ilscripts.cfg
+++ b/config-model/src/test/derived/inheritance/ilscripts.cfg
@@ -9,5 +9,5 @@ ilscript[].docfield[] "onlychild"
ilscript[].content[] "clear_state | guard { input onlygrandparent | attribute onlygrandparent; }"
ilscript[].content[] "clear_state | guard { input overridden | attribute overridden; }"
ilscript[].content[] "clear_state | guard { input onlyfather | summary onlyfather; }"
-ilscript[].content[] "clear_state | guard { input onlymother | tokenize normalize stem:\"SHORTEST\" | attribute onlymother | index onlymother; }"
-ilscript[].content[] "clear_state | guard { input onlychild | tokenize normalize stem:\"SHORTEST\" | index onlychild; }"
+ilscript[].content[] "clear_state | guard { input onlymother | tokenize normalize stem:\"BEST\" | attribute onlymother | index onlymother; }"
+ilscript[].content[] "clear_state | guard { input onlychild | tokenize normalize stem:\"BEST\" | index onlychild; }"
diff --git a/config-model/src/test/derived/inheritance/index-info.cfg b/config-model/src/test/derived/inheritance/index-info.cfg
index fe7bf334fcc..e0be7b7d71f 100644
--- a/config-model/src/test/derived/inheritance/index-info.cfg
+++ b/config-model/src/test/derived/inheritance/index-info.cfg
@@ -22,7 +22,7 @@ indexinfo[].command[].command "index"
indexinfo[].command[].indexname "onlymother"
indexinfo[].command[].command "lowercase"
indexinfo[].command[].indexname "onlymother"
-indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].command "stem:BEST"
indexinfo[].command[].indexname "onlymother"
indexinfo[].command[].command "normalize"
indexinfo[].command[].indexname "onlymother"
@@ -32,7 +32,7 @@ indexinfo[].command[].command "index"
indexinfo[].command[].indexname "onlychild"
indexinfo[].command[].command "lowercase"
indexinfo[].command[].indexname "onlychild"
-indexinfo[].command[].command "stem:SHORTEST"
+indexinfo[].command[].command "stem:BEST"
indexinfo[].command[].indexname "onlychild"
indexinfo[].command[].command "normalize"
indexinfo[].command[].indexname "onlychild"