summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2019-09-22 23:29:13 +0200
committerTor Egge <Tor.Egge@broadpark.no>2019-09-22 23:47:12 +0200
commit108cca8c1db30649de2bcf2372b9c24d698af311 (patch)
treeb28d42ac85ee81aac48cd806cc95afbb56325ad9 /config
parent5944399213e87c5416b50297fd5dd87a63554992 (diff)
Avoid config generation race.
Diffstat (limited to 'config')
-rw-r--r--config/src/tests/configgen/CMakeLists.txt13
1 files changed, 11 insertions, 2 deletions
diff --git a/config/src/tests/configgen/CMakeLists.txt b/config/src/tests/configgen/CMakeLists.txt
index eec5e40db2a..b24a48d8cbf 100644
--- a/config/src/tests/configgen/CMakeLists.txt
+++ b/config/src/tests/configgen/CMakeLists.txt
@@ -4,9 +4,11 @@ vespa_add_executable(config_configgen_test_app TEST
configgen.cpp
DEPENDS
config_cloudconfig
+ config_tests_configgen_config
+ AFTER
+ config_tests_configgen_config
)
vespa_add_test(NAME config_configgen_test_app COMMAND config_configgen_test_app)
-vespa_generate_config(config_configgen_test_app ../../test/resources/configdefinitions/motd.def)
vespa_add_executable(config_vector_inserter_test_app TEST
SOURCES
vector_inserter.cpp
@@ -26,6 +28,13 @@ vespa_add_executable(config_value_converter_test_app TEST
value_converter.cpp
DEPENDS
config_cloudconfig
+ config_tests_configgen_config
+ AFTER
+ config_tests_configgen_config
)
vespa_add_test(NAME config_value_converter_test_app COMMAND config_value_converter_test_app)
-vespa_generate_config(config_value_converter_test_app ../../test/resources/configdefinitions/motd.def)
+
+vespa_add_library(config_tests_configgen_config OBJECT
+)
+
+vespa_generate_config(config_tests_configgen_config ../../test/resources/configdefinitions/motd.def)