Revert "Add conan_test_package for rsa_discovery_zeroconf"

This reverts commit 1998e10.
apache · May 5, 2023 · cdc77e0 · cdc77e0
1 parent e46bcb8
commit cdc77e0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/examples/conan_test_package/CMakeLists.txt b/examples/conan_test_package/CMakeLists.txt
@@ -237,18 +237,6 @@ if (TEST_RSA_DISCOVERY_ETCD)
             )
 endif ()
 
-option(TEST_RSA_DISCOVERY_ZEROCONF "Test the Discovery (ZEROCONF) bundle" OFF)
-if (TEST_RSA_DISCOVERY_ZEROCONF)
-    add_celix_container(use_rsa_discovery_zeroconf
-            BUNDLES
-            Celix::rsa_discovery_zeroconf
-            Celix::rsa_topology_manager
-            my_rsa
-            hello
-            PROPERTIES
-            )
-endif ()
-
 option(TEST_SHELL "Test shell" OFF)
 if (TEST_SHELL)
     add_executable(use_shell test_shell.c)

diff --git a/examples/conan_test_package/conanfile.py b/examples/conan_test_package/conanfile.py
@@ -40,7 +40,6 @@ def build(self):
         cmake.definitions["TEST_RSA_RPC_JSON"] = self.options["celix"].build_rsa_json_rpc
         cmake.definitions["TEST_RSA_DISCOVERY_CONFIGURED"] = self.options["celix"].build_rsa_discovery_configured
         cmake.definitions["TEST_RSA_DISCOVERY_ETCD"] = self.options["celix"].build_rsa_discovery_etcd
-        cmake.definitions["TEST_RSA_DISCOVERY_ZEROCONF"] = self.options["celix"].build_rsa_discovery_zeroconf
         cmake.definitions["TEST_SHELL"] = self.options["celix"].build_shell
         if self.options["celix"].build_shell:
             cmake.definitions["TEST_CXX_SHELL"] = self.options["celix"].celix_cxx17 or self.options["celix"].celix_cxx14
@@ -94,8 +93,6 @@ def test(self):
                 self.run("./use_rsa_configured", cwd=os.path.join("deploy", "use_rsa_configured"), run_environment=True)
             if self.options["celix"].build_rsa_discovery_etcd:
                 self.run("./use_rsa_etcd", cwd=os.path.join("deploy", "use_rsa_etcd"), run_environment=True)
-            if self.options["celix"].build_rsa_discovery_zeroconf:
-                self.run("./use_rsa_discovery_zeroconf", cwd=os.path.join("deploy", "use_rsa_discovery_zeroconf"), run_environment=True)
             if self.options["celix"].build_shell:
                 self.run("./use_shell", run_environment=True)
                 if self.options["celix"].celix_cxx17 or self.options["celix"].celix_cxx14: