From 59f2ad24a3a1a71bba62a5335f8cb755feab9c7a Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Thu, 2 Jul 2020 10:36:58 +0200 Subject: Revert "Avoid config generation race." This reverts commit 108cca8c1db30649de2bcf2372b9c24d698af311. --- config/src/tests/configgen/CMakeLists.txt | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'config/src') diff --git a/config/src/tests/configgen/CMakeLists.txt b/config/src/tests/configgen/CMakeLists.txt index b24a48d8cbf..eec5e40db2a 100644 --- a/config/src/tests/configgen/CMakeLists.txt +++ b/config/src/tests/configgen/CMakeLists.txt @@ -4,11 +4,9 @@ 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 @@ -28,13 +26,6 @@ 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_add_library(config_tests_configgen_config OBJECT -) - -vespa_generate_config(config_tests_configgen_config ../../test/resources/configdefinitions/motd.def) +vespa_generate_config(config_value_converter_test_app ../../test/resources/configdefinitions/motd.def) -- cgit v1.2.3