diff options
| author | gjoranv <gjoranv@gmail.com> | 2017-09-05 10:24:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-05 10:24:36 +0200 |
| commit | dcd280c9de94e318df07f41b74fc24d6f21521d5 (patch) | |
| tree | 1a015f46fb24630a59f7c78a7b8ec956356ca0d4 /configgen | |
| parent | f14b11c91a8163ee0220d7a3caee0a86c8d5ebbc (diff) | |
| parent | 9f506465b36ef1b7a858211882fc3594d170b418 (diff) | |
Merge pull request #3287 from vespa-engine/revert-3275-revert-3260-hmusum/remove-version-from-def-files
Revert 3275 revert 3260 hmusum/remove version from def files
Diffstat (limited to 'configgen')
| -rw-r--r-- | configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java | 3 | ||||
| -rw-r--r-- | configgen/src/test/resources/allfeatures.def | 1 | ||||
| -rw-r--r-- | configgen/src/test/resources/bar.foo.def | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java index 45070451392..0d8135e67de 100644 --- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java +++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java @@ -68,8 +68,7 @@ public class NormalizedDefinitionTest { } assertNotNull(out); - assertThat(out.size(), is(70)); - assertThat(out.get(19), is ("version=11\n")); + assertThat(out.size(), is(69)); assertNotNull(fileReader); fileReader.close(); diff --git a/configgen/src/test/resources/allfeatures.def b/configgen/src/test/resources/allfeatures.def index bedb8cb6dbf..e13e14c9e36 100644 --- a/configgen/src/test/resources/allfeatures.def +++ b/configgen/src/test/resources/allfeatures.def @@ -18,7 +18,6 @@ # - Have an array within a struct, to verify that we correctly recurse. # - Reuse type name further within to ensure that this works. -version=11 namespace=configgen # Some random bool without a default value. These comments exist to check # that comment parsing works.e diff --git a/configgen/src/test/resources/bar.foo.def b/configgen/src/test/resources/bar.foo.def index b22be0c62dc..e0084b792a5 100644 --- a/configgen/src/test/resources/bar.foo.def +++ b/configgen/src/test/resources/bar.foo.def @@ -1,4 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -version=1 namespace=baz xyzzy int default=10 |