This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/816-drop-conan-1.x in repository https://gitbox.apache.org/repos/asf/celix.git
commit da140f541432dd2fb6ecc120218940eae28d8910 Author: PengZheng <[email protected]> AuthorDate: Tue Mar 10 13:36:34 2026 +0800 Drop Conan 1.x support and move test_package to its conventional location. --- .github/workflows/conan_create.yml | 4 +- conanfile.py | 2 +- examples/conan_test_package/conanfile.py | 136 --------------------- examples/conan_test_package_v2/CMakeLists.txt | 19 --- .../CMakeLists.txt | 0 .../conan_test_package => test_package}/README.md | 11 +- .../conanfile.py | 32 ++--- .../hello_bundle.c | 0 .../my_log_writer_activator.c | 0 .../my_rsa_activator.c | 0 .../test_c_rsa_spi.c | 0 .../test_celix_dfi.c | 0 .../test_cxx_shell.cpp | 0 .../test_etcd_lib.c | 0 .../test_event_admin_api.c | 0 .../test_event_admin_spi.c | 0 .../test_framework.c | 0 .../test_http_admin_activator.c | 0 .../test_log_helper.c | 0 .../test_log_service_api.c | 0 .../test_promises.cpp | 0 .../test_pushstreams.cpp | 0 .../test_rsa_spi.cc | 0 .../test_rsa_utils.cc | 0 .../test_shell.c | 0 .../test_shell_api.c | 0 .../test_utils.c | 0 27 files changed, 22 insertions(+), 182 deletions(-) diff --git a/.github/workflows/conan_create.yml b/.github/workflows/conan_create.yml index 2bed2c387..308e35b67 100644 --- a/.github/workflows/conan_create.yml +++ b/.github/workflows/conan_create.yml @@ -66,7 +66,7 @@ jobs: CC: ${{ matrix.compiler[0] }} CXX: ${{ matrix.compiler[1] }} run: | - conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default -pr:h default -s:h build_type=${{ matrix.type }} -tf examples/conan_test_package_v2 -o celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True + conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default -pr:h default -s:h build_type=${{ matrix.type }} -o celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True - name: Dependency Deduction Test env: CC: ${{ matrix.compiler[0] }} @@ -116,7 +116,7 @@ jobs: ${{ runner.os }}-ccache-Release- - name: Create Celix run: | - conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -tf examples/conan_test_package_v2 -o celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True -o celix/*:enable_address_sanitizer=True + conan create . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:build_all=True -o celix/*:enable_ccache=True -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -o celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True -o celix/*:enable_address_sanitizer=True - name: Dependency Deduction Test run: | conan inspect . | awk 'BEGIN { FS="[\t:]+"; output=0 } /build/ && !/build_all/ && !/build_rsa_remote_service_admin_shm_v2/ && !/build_rsa_discovery_zeroconf/ { if(output) print $1} /^options/ {output=1} /^options_definitions/ {output=0}' | while read option; do conan build . -c tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix/*:${option}=True -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -of ${option}_dir -o celix/*:celix_cxx17=Tru [...] diff --git a/conanfile.py b/conanfile.py index bdf002d31..7a12b5a57 100644 --- a/conanfile.py +++ b/conanfile.py @@ -33,7 +33,7 @@ class CelixConan(ConanFile): url = "https://github.com/apache/celix.git"; topics = ("conan", "celix", "osgi", "embedded", "linux", "C/C++") exports_sources = ("CMakeLists.txt", "bundles*", "cmake*", "!cmake-build*", "examples*", "libs*", "misc*", - "LICENSE", "!examples/conan_test_package*") + "LICENSE") generators = "CMakeDeps", "VirtualRunEnv" settings = "os", "arch", "compiler", "build_type" license = " Apache-2.0" diff --git a/examples/conan_test_package/conanfile.py b/examples/conan_test_package/conanfile.py deleted file mode 100644 index bdcb51686..000000000 --- a/examples/conan_test_package/conanfile.py +++ /dev/null @@ -1,136 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -from conans import CMake, ConanFile, tools -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - generators = "cmake_paths", "cmake_find_package" - # requires = "celix/2.3.0@docker/test" - - def build(self): - cmake = CMake(self) - cmake.definitions["ENABLE_ADDRESS_SANITIZER"] = self.options["celix"].enable_address_sanitizer - cmake.definitions["TEST_FRAMEWORK"] = self.options["celix"].build_framework - cmake.definitions["TEST_HTTP_ADMIN"] = self.options["celix"].build_http_admin - cmake.definitions["TEST_LOG_SERVICE"] = self.options["celix"].build_log_service - cmake.definitions["TEST_SYSLOG_WRITER"] = self.options["celix"].build_syslog_writer - cmake.definitions["TEST_RSA"] = self.options["celix"].build_remote_service_admin - cmake.definitions["TEST_RSA_DFI"] = self.options["celix"].build_rsa_remote_service_admin_dfi - cmake.definitions["TEST_RSA_SHM_V2"] = self.options["celix"].build_rsa_remote_service_admin_shm_v2 - 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 - cmake.definitions["TEST_REMOTE_SHELL"] = self.options["celix"].build_remote_shell - cmake.definitions["TEST_SHELL_TUI"] = self.options["celix"].build_shell_tui - cmake.definitions["TEST_SHELL_WUI"] = self.options["celix"].build_shell_wui - cmake.definitions["TEST_ETCD_LIB"] = self.options["celix"].build_celix_etcdlib - cmake.definitions["TEST_LAUNCHER"] = self.options["celix"].build_launcher - cmake.definitions["TEST_PROMISES"] = self.options["celix"].build_promises - cmake.definitions["TEST_PUSHSTREAMS"] = self.options["celix"].build_pushstreams - cmake.definitions["TEST_LOG_HELPER"] = self.options["celix"].build_log_helper - cmake.definitions["TEST_LOG_SERVICE_API"] = self.options["celix"].build_log_service_api - cmake.definitions["TEST_CXX_REMOTE_SERVICE_ADMIN"] = self.options["celix"].build_cxx_remote_service_admin - cmake.definitions["TEST_SHELL_API"] = self.options["celix"].build_shell_api - cmake.definitions["TEST_CELIX_DFI"] = self.options["celix"].build_celix_dfi - cmake.definitions["TEST_UTILS"] = self.options["celix"].build_utils - cmake.definitions["TEST_EVENT_ADMIN"] = self.options["celix"].build_event_admin - cmake.definitions["TEST_EVENT_ADMIN_REMOTE_PROVIDER_MQTT"] = self.options["celix"].build_event_admin_remote_provider_mqtt - cmake.definitions["TEST_COMPONENTS_READY_CHECK"] = self.options["celix"].build_components_ready_check - cmake.definitions["CMAKE_PROJECT_test_package_INCLUDE"] = os.path.join(self.build_folder, "conan_paths.cmake") - # the following is workaround https://github.com/conan-io/conan/issues/7192 - if self.settings.os == "Linux": - cmake.definitions["CMAKE_EXE_LINKER_FLAGS"] = "-Wl,--unresolved-symbols=ignore-in-shared-libs" - cmake.configure() - cmake.build() - - def test(self): - if not tools.cross_building(self, skip_x64_x86=True): - if self.options["celix"].build_framework: - self.run("./use_framework", run_environment=True) - if self.options["celix"].build_http_admin: - self.run("./use_http_admin", cwd=os.path.join("deploy", "use_http_admin"), run_environment=True) - if self.options["celix"].build_log_service: - self.run("./use_log_writer", cwd=os.path.join("deploy", "use_log_writer"), run_environment=True) - if self.options["celix"].build_syslog_writer: - self.run("./use_syslog_writer", cwd=os.path.join("deploy", "use_syslog_writer"), run_environment=True) - if self.options["celix"].build_remote_service_admin: - self.run("./use_my_rsa", cwd=os.path.join("deploy", "use_my_rsa"), run_environment=True) - self.run("./use_c_rsa_spi", run_environment=True) - self.run("./use_rsa_utils", run_environment=True) - if self.options["celix"].build_rsa_remote_service_admin_dfi and self.options["celix"].build_launcher: - self.run("./use_rsa_dfi", cwd=os.path.join("deploy", "use_rsa_dfi"), run_environment=True) - if self.options["celix"].build_rsa_remote_service_admin_shm_v2: - self.run("./use_rsa_shm_v2", cwd=os.path.join("deploy", "use_rsa_shm_v2"), run_environment=True) - if self.options["celix"].build_rsa_json_rpc: - self.run("./use_rsa_rpc_json", cwd=os.path.join("deploy", "use_rsa_rpc_json"), run_environment=True) - if self.options["celix"].build_rsa_discovery_configured and self.options["celix"].build_launcher: - self.run("./use_rsa_configured", cwd=os.path.join("deploy", "use_rsa_configured"), run_environment=True) - if self.options["celix"].build_rsa_discovery_etcd and self.options["celix"].build_launcher: - 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: - self.run("./use_cxx_shell", run_environment=True) - if self.options["celix"].build_remote_shell: - self.run("./use_remote_shell", cwd=os.path.join("deploy", "use_remote_shell"), run_environment=True) - if self.options["celix"].build_shell_tui: - self.run("./use_shell_tui", cwd=os.path.join("deploy", "use_shell_tui"), run_environment=True) - if self.options["celix"].build_shell_wui: - self.run("./use_shell_wui", cwd=os.path.join("deploy", "use_shell_wui"), run_environment=True) - if self.options["celix"].build_celix_etcdlib: - self.run("./use_etcd_lib", run_environment=True) - if self.options["celix"].build_launcher: - self.run("./use_launcher", cwd=os.path.join("deploy", "use_launcher"), run_environment=True) - if self.options["celix"].build_promises: - self.run("./use_promises", run_environment=True) - if self.options["celix"].build_pushstreams: - self.run("./use_pushstreams", run_environment=True) - if self.options["celix"].build_log_helper: - self.run("./use_log_helper", run_environment=True) - if self.options["celix"].build_log_service_api: - self.run("./use_log_service_api", run_environment=True) - if self.options["celix"].build_cxx_remote_service_admin: - self.run("./use_cxx_remote_service_admin", - cwd=os.path.join("deploy", "use_cxx_remote_service_admin"), run_environment=True) - self.run("./use_rsa_spi", run_environment=True) - if self.options["celix"].build_shell_api: - self.run("./use_shell_api", run_environment=True) - if self.options["celix"].build_celix_dfi: - self.run("./use_celix_dfi", run_environment=True) - if self.options["celix"].build_utils: - self.run("./use_utils", run_environment=True) - if self.options["celix"].build_event_admin: - self.run("./use_event_admin", - cwd=os.path.join("deploy", "use_event_admin"), run_environment=True) - self.run("./use_event_admin_api", run_environment=True) - self.run("./use_event_admin_spi", run_environment=True) - if self.options["celix"].build_event_admin_remote_provider_mqtt: - self.run("./use_event_admin_remote_provider_mqtt", - cwd=os.path.join("deploy", "use_event_admin_remote_provider_mqtt"), run_environment=True) - if self.options["celix"].build_components_ready_check: - self.run("./use_components_ready_check", - cwd=os.path.join("deploy", "use_components_ready_check"), run_environment=True) diff --git a/examples/conan_test_package_v2/CMakeLists.txt b/examples/conan_test_package_v2/CMakeLists.txt deleted file mode 100644 index 6ab3a2010..000000000 --- a/examples/conan_test_package_v2/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -cmake_minimum_required (VERSION 3.14) -project(test_package_v2) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../conan_test_package ${CMAKE_CURRENT_BINARY_DIR}/conan_test_package) \ No newline at end of file diff --git a/examples/conan_test_package/CMakeLists.txt b/test_package/CMakeLists.txt similarity index 100% rename from examples/conan_test_package/CMakeLists.txt rename to test_package/CMakeLists.txt diff --git a/examples/conan_test_package/README.md b/test_package/README.md similarity index 81% rename from examples/conan_test_package/README.md rename to test_package/README.md index 48c3dc419..85e4904c2 100644 --- a/examples/conan_test_package/README.md +++ b/test_package/README.md @@ -34,19 +34,14 @@ a Celix package is properly installed in the local Conan cache. To this end, it To create a Celix package in the local cache with C++ support and verify that it's properly installed, run the following command in the Celix root directory: ```BASH -conan create . celix/2.2.3@zhengpeng/testing -tf examples/conan_test_package/ -o celix:celix_cxx17=True +conan create . -o celix_cxx17=True ``` To verify a Celix package with C++ support is properly installed in the local cache, run the following command in the Celix root directory: ```BASH -conan test examples/conan_test_package/ celix/2.2.3@zhengpeng/testing -o celix:celix_cxx17=True +conan test test_package celix/3.0.0@ -o celix_cxx17=True ``` Though it might not be wise to spend time reading C/C++ codes in this folder, it's instructive to have a look at `conanfile.py` and `CMakeLists.txt`, -which illustrates a non-intrusive way of using Conan with CMake build system. Pay attention to our use of `cmake_paths` `cmake_find_package` generators -and the following line: - -```python - cmake.definitions["CMAKE_PROJECT_test_package_INCLUDE"] = os.path.join(self.build_folder, "conan_paths.cmake") -``` +which illustrates a non-intrusive way of using Conan with CMake build system. diff --git a/examples/conan_test_package_v2/conanfile.py b/test_package/conanfile.py similarity index 86% rename from examples/conan_test_package_v2/conanfile.py rename to test_package/conanfile.py index 0b57a9d8f..57a2ddc97 100644 --- a/examples/conan_test_package_v2/conanfile.py +++ b/test_package/conanfile.py @@ -83,7 +83,7 @@ class TestPackageConan(ConanFile): with chdir(self, self.build_folder): celix_options = self.dependencies["celix"].options if celix_options.build_framework: - self.run("./conan_test_package/use_framework", env="conanrun") + self.run("./use_framework", env="conanrun") if celix_options.build_http_admin: self.run("./use_http_admin", cwd=os.path.join("deploy", "use_http_admin"), env="conanrun") if celix_options.build_log_service: @@ -92,8 +92,8 @@ class TestPackageConan(ConanFile): self.run("./use_syslog_writer", cwd=os.path.join("deploy", "use_syslog_writer"), env="conanrun") if celix_options.build_remote_service_admin: self.run("./use_my_rsa", cwd=os.path.join("deploy", "use_my_rsa"), env="conanrun") - self.run("./conan_test_package/use_c_rsa_spi", env="conanrun") - self.run("./conan_test_package/use_rsa_utils", env="conanrun") + self.run("./use_c_rsa_spi", env="conanrun") + self.run("./use_rsa_utils", env="conanrun") if celix_options.build_rsa_remote_service_admin_dfi and celix_options.build_launcher: self.run("./use_rsa_dfi", cwd=os.path.join("deploy", "use_rsa_dfi"), env="conanrun") @@ -109,9 +109,9 @@ class TestPackageConan(ConanFile): self.run("./use_rsa_discovery_zeroconf", cwd=os.path.join("deploy", "use_rsa_discovery_zeroconf"), env="conanrun") if celix_options.build_shell: - self.run("./conan_test_package/use_shell", env="conanrun") + self.run("./use_shell", env="conanrun") if celix_options.celix_cxx17 or celix_options.celix_cxx14: - self.run("./conan_test_package/use_cxx_shell", env="conanrun") + self.run("./use_cxx_shell", env="conanrun") if celix_options.build_remote_shell: self.run("./use_remote_shell", cwd=os.path.join("deploy", "use_remote_shell"), env="conanrun") if celix_options.build_shell_tui: @@ -119,32 +119,32 @@ class TestPackageConan(ConanFile): if celix_options.build_shell_wui: self.run("./use_shell_wui", cwd=os.path.join("deploy", "use_shell_wui"), env="conanrun") if celix_options.build_celix_etcdlib: - self.run("./conan_test_package/use_etcd_lib", env="conanrun") + self.run("./use_etcd_lib", env="conanrun") if celix_options.build_launcher: self.run("./use_launcher", cwd=os.path.join("deploy", "use_launcher"), env="conanrun") if celix_options.build_promises: - self.run("./conan_test_package/use_promises", env="conanrun") + self.run("./use_promises", env="conanrun") if celix_options.build_pushstreams: - self.run("./conan_test_package/use_pushstreams", env="conanrun") + self.run("./use_pushstreams", env="conanrun") if celix_options.build_log_helper: - self.run("./conan_test_package/use_log_helper", env="conanrun") + self.run("./use_log_helper", env="conanrun") if celix_options.build_log_service_api: - self.run("./conan_test_package/use_log_service_api", env="conanrun") + self.run("./use_log_service_api", env="conanrun") if celix_options.build_cxx_remote_service_admin: self.run("./use_cxx_remote_service_admin", cwd=os.path.join("deploy", "use_cxx_remote_service_admin"), env="conanrun") - self.run("./conan_test_package/use_rsa_spi", env="conanrun") + self.run("./use_rsa_spi", env="conanrun") if celix_options.build_shell_api: - self.run("./conan_test_package/use_shell_api", env="conanrun") + self.run("./use_shell_api", env="conanrun") if celix_options.build_celix_dfi: - self.run("./conan_test_package/use_celix_dfi", env="conanrun") + self.run("./use_celix_dfi", env="conanrun") if celix_options.build_utils: - self.run("./conan_test_package/use_utils", env="conanrun") + self.run("./use_utils", env="conanrun") if celix_options.build_event_admin: self.run("./use_event_admin", cwd=os.path.join("deploy", "use_event_admin"), env="conanrun") - self.run("./conan_test_package/use_event_admin_api", env="conanrun") - self.run("./conan_test_package/use_event_admin_spi", env="conanrun") + self.run("./use_event_admin_api", env="conanrun") + self.run("./use_event_admin_spi", env="conanrun") if celix_options.build_event_admin_remote_provider_mqtt: self.run("./use_event_admin_remote_provider_mqtt", cwd=os.path.join("deploy", "use_event_admin_remote_provider_mqtt"), env="conanrun") diff --git a/examples/conan_test_package/hello_bundle.c b/test_package/hello_bundle.c similarity index 100% rename from examples/conan_test_package/hello_bundle.c rename to test_package/hello_bundle.c diff --git a/examples/conan_test_package/my_log_writer_activator.c b/test_package/my_log_writer_activator.c similarity index 100% rename from examples/conan_test_package/my_log_writer_activator.c rename to test_package/my_log_writer_activator.c diff --git a/examples/conan_test_package/my_rsa_activator.c b/test_package/my_rsa_activator.c similarity index 100% rename from examples/conan_test_package/my_rsa_activator.c rename to test_package/my_rsa_activator.c diff --git a/examples/conan_test_package/test_c_rsa_spi.c b/test_package/test_c_rsa_spi.c similarity index 100% rename from examples/conan_test_package/test_c_rsa_spi.c rename to test_package/test_c_rsa_spi.c diff --git a/examples/conan_test_package/test_celix_dfi.c b/test_package/test_celix_dfi.c similarity index 100% rename from examples/conan_test_package/test_celix_dfi.c rename to test_package/test_celix_dfi.c diff --git a/examples/conan_test_package/test_cxx_shell.cpp b/test_package/test_cxx_shell.cpp similarity index 100% rename from examples/conan_test_package/test_cxx_shell.cpp rename to test_package/test_cxx_shell.cpp diff --git a/examples/conan_test_package/test_etcd_lib.c b/test_package/test_etcd_lib.c similarity index 100% rename from examples/conan_test_package/test_etcd_lib.c rename to test_package/test_etcd_lib.c diff --git a/examples/conan_test_package/test_event_admin_api.c b/test_package/test_event_admin_api.c similarity index 100% rename from examples/conan_test_package/test_event_admin_api.c rename to test_package/test_event_admin_api.c diff --git a/examples/conan_test_package/test_event_admin_spi.c b/test_package/test_event_admin_spi.c similarity index 100% rename from examples/conan_test_package/test_event_admin_spi.c rename to test_package/test_event_admin_spi.c diff --git a/examples/conan_test_package/test_framework.c b/test_package/test_framework.c similarity index 100% rename from examples/conan_test_package/test_framework.c rename to test_package/test_framework.c diff --git a/examples/conan_test_package/test_http_admin_activator.c b/test_package/test_http_admin_activator.c similarity index 100% rename from examples/conan_test_package/test_http_admin_activator.c rename to test_package/test_http_admin_activator.c diff --git a/examples/conan_test_package/test_log_helper.c b/test_package/test_log_helper.c similarity index 100% rename from examples/conan_test_package/test_log_helper.c rename to test_package/test_log_helper.c diff --git a/examples/conan_test_package/test_log_service_api.c b/test_package/test_log_service_api.c similarity index 100% rename from examples/conan_test_package/test_log_service_api.c rename to test_package/test_log_service_api.c diff --git a/examples/conan_test_package/test_promises.cpp b/test_package/test_promises.cpp similarity index 100% rename from examples/conan_test_package/test_promises.cpp rename to test_package/test_promises.cpp diff --git a/examples/conan_test_package/test_pushstreams.cpp b/test_package/test_pushstreams.cpp similarity index 100% rename from examples/conan_test_package/test_pushstreams.cpp rename to test_package/test_pushstreams.cpp diff --git a/examples/conan_test_package/test_rsa_spi.cc b/test_package/test_rsa_spi.cc similarity index 100% rename from examples/conan_test_package/test_rsa_spi.cc rename to test_package/test_rsa_spi.cc diff --git a/examples/conan_test_package/test_rsa_utils.cc b/test_package/test_rsa_utils.cc similarity index 100% rename from examples/conan_test_package/test_rsa_utils.cc rename to test_package/test_rsa_utils.cc diff --git a/examples/conan_test_package/test_shell.c b/test_package/test_shell.c similarity index 100% rename from examples/conan_test_package/test_shell.c rename to test_package/test_shell.c diff --git a/examples/conan_test_package/test_shell_api.c b/test_package/test_shell_api.c similarity index 100% rename from examples/conan_test_package/test_shell_api.c rename to test_package/test_shell_api.c diff --git a/examples/conan_test_package/test_utils.c b/test_package/test_utils.c similarity index 100% rename from examples/conan_test_package/test_utils.c rename to test_package/test_utils.c
