Revert "Revert "Aressem/move messagebus test tests to separate module""

1 files changed, 14 insertions, 10 deletions

diff --git a/searchcorespi/src/tests/plugin/CMakeLists.txt b/searchcorespi/src/tests/plugin/CMakeLists.txt
index ef7f0ad316f..333f927c3d2 100644
--- a/searchcorespi/src/tests/plugin/CMakeLists.txt
+++ b/searchcorespi/src/tests/plugin/CMakeLists.txt
@@ -1,14 +1,28 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_library(searchcorespi_tplugin
+        SOURCES
+        plugin.cpp
+        DEPENDS
+)
+vespa_add_library(searchcorespi_illegal-plugin
+        SOURCES
+        empty.cpp
+        DEPENDS
+)
 vespa_add_executable(searchcorespi_plugin_test_app TEST
     SOURCES
     plugin_test.cpp
     DEPENDS
     searchcorespi
+    AFTER
+    searchcorespi_tplugin
+    searchcorespi_illegal-plugin
 )
 vespa_add_test(
     NAME searchcorespi_plugin_test_app
     COMMAND searchcorespi_plugin_test_app
     ENVIRONMENT "LD_LIBRARY_PATH=."
+    DEPENDS searchcorespi_tplugin searchcorespi_illegal-plugin
 )
 vespa_add_executable(searchcorespi_factoryregistry_test_app TEST
     SOURCES
@@ -17,13 +31,3 @@ vespa_add_executable(searchcorespi_factoryregistry_test_app TEST
     searchcorespi
 )
 vespa_add_test(NAME searchcorespi_factoryregistry_test_app COMMAND searchcorespi_factoryregistry_test_app)
-vespa_add_library(searchcorespi_tplugin
-    SOURCES
-    plugin.cpp
-    DEPENDS
-)
-vespa_add_library(searchcorespi_illegal-plugin
-    SOURCES
-    empty.cpp
-    DEPENDS
-)