* [gentoo-commits] repo/gentoo:master commit in: dev-libs/metee/files/, dev-libs/metee/
@ 2025-05-24 2:22 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-05-24 2:22 UTC (permalink / raw
To: gentoo-commits
commit: f91d23ad945f835be7f9259808e90f33b7aba336
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 24 02:18:01 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 24 02:18:25 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91d23ad
dev-libs/metee: wire up tests
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../metee/files/metee-5.0.0-system-gtest.patch | 42 ++++++++++++++++++++++
dev-libs/metee/metee-5.0.0.ebuild | 38 +++++++++++++++++---
2 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/dev-libs/metee/files/metee-5.0.0-system-gtest.patch b/dev-libs/metee/files/metee-5.0.0-system-gtest.patch
new file mode 100644
index 000000000000..f0129aa2b19a
--- /dev/null
+++ b/dev-libs/metee/files/metee-5.0.0-system-gtest.patch
@@ -0,0 +1,42 @@
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 4344119..665dd4b 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -3,12 +3,9 @@
+ cmake_minimum_required(VERSION 3.15)
+ project(metee_test)
+
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+
+-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/googletest-src)
+- file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/googletest-src
+- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+- )
++if(TRUE)
+ else(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/googletest-src)
+ # Download and unpack googletest at configure time
+ configure_file(gtest.cmake.in googletest-download/CMakeLists.txt)
+@@ -36,13 +33,6 @@ set(gtest_force_shared_crt
+ CACHE BOOL "" FORCE
+ )
+
+-# Add googletest directly to our build. This defines the gtest and gtest_main
+-# targets.
+-add_subdirectory(
+- ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
+- ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL
+-)
+-
+ add_executable(${PROJECT_NAME}
+ Main.cpp
+ metee_test.cpp
+@@ -53,7 +43,7 @@ if(NOT CONSOLE_OUTPUT)
+ target_compile_definitions(${PROJECT_NAME} PRIVATE -DSYSLOG)
+ endif()
+
+-target_link_libraries(${PROJECT_NAME} metee gtest_main gmock_main)
++target_link_libraries(${PROJECT_NAME} metee gtest gmock)
+
+ target_include_directories(${PROJECT_NAME}
+ PRIVATE ${CMAKE_SOURCE_DIR}/src/Windows
diff --git a/dev-libs/metee/metee-5.0.0.ebuild b/dev-libs/metee/metee-5.0.0.ebuild
index bbbb7e70f0fe..435523682a22 100644
--- a/dev-libs/metee/metee-5.0.0.ebuild
+++ b/dev-libs/metee/metee-5.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake
+inherit cmake edo
DESCRIPTION="Cross-platform access library for Intel CSME HECI interface"
HOMEPAGE="https://github.com/intel/metee"
@@ -12,12 +12,19 @@ SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
LICENSE="Apache-2.0"
SLOT="0/${PV}"
KEYWORDS="~amd64"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
-BDEPEND="doc? ( app-text/doxygen )"
+BDEPEND="
+ doc? ( app-text/doxygen )
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.0.0-system-gtest.patch
+)
src_prepare() {
- default
cmake_src_prepare
# Respect users CFLAGS
@@ -29,9 +36,30 @@ src_configure() {
-DBUILD_DOCS="$(usex doc)"
-DBUILD_SAMPLES="NO"
-DBUILD_SHARED_LIBS="YES"
- -DBUILD_TEST="NO"
+ -DBUILD_TEST="$(usex test)"
-DCONSOLE_OUTPUT="NO"
)
cmake_src_configure
}
+
+src_test() {
+ local skip_tests=(
+ MeTeeTESTInstance/MeTeeTEST.PROD_N_TestGetMeiKind/PCH
+ MeTeePPTESTInstance/MeTeePPTEST.PROD_MKHI_MoveSemantics/PCH
+ )
+
+ # The format for disabling test1, test2, and test3 looks like:
+ # -test1:test2:test3
+ edo "${BUILD_DIR}"/tests/metee_test \
+ --gtest_filter=-$(echo $(IFS=:; echo "${skip_tests[*]}"))
+}
+
+src_install() {
+ cmake_src_install
+
+ # Don't install test binary
+ if use test ; then
+ rm "${ED}"/usr/bin/metee_test || die
+ fi
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/metee/files/, dev-libs/metee/
@ 2022-03-12 11:52 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2022-03-12 11:52 UTC (permalink / raw
To: gentoo-commits
commit: 58170e4a8daebbc8e1181cb62b7be8d0e7578fc5
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 11:46:12 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 11:52:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58170e4a
dev-libs/metee: drop 3.1.0
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-libs/metee/Manifest | 1 -
.../files/metee-3.1.0-make-docs-optional.patch | 81 ----------------------
dev-libs/metee/metee-3.1.0.ebuild | 31 ---------
3 files changed, 113 deletions(-)
diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest
index 4cd229bc853b..bcef7fe7655a 100644
--- a/dev-libs/metee/Manifest
+++ b/dev-libs/metee/Manifest
@@ -1,2 +1 @@
-DIST metee-3.1.0.tar.gz 70185 BLAKE2B 7f0c595b52b608e1136c77df13244681b73f099e384fae6f5ccd350ccf679f539c8b0bc8ac062f386fa41cec9c9edf3064a6c6a981af4ccdc978629a9ebc0d90 SHA512 a967df238f2a51ecbee6fe3fe8a0d63aa321c35a520f0297688a6dab1d760358bca53a6d3cf3446f1fc9cf7f0a6c13746f5d3aa1e2064e753b1bbdb2bd356e60
DIST metee-3.1.2.tar.gz 70404 BLAKE2B 811b33dafd6d0f15c6860a97ba9ffb20969548e7fceb3bcc25f96e9eefd27576d076629c21ea7b9c83f934815a6c27229465818c64e2c0fb8996ab9fd6c36a18 SHA512 e1a741a4ebb0971356c00ad51c8b17d273fc3d6453ebe374766259bab855b721cd5223b214447df52f0991474f720010549d88000d47846619252e1c19f84347
diff --git a/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch b/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch
deleted file mode 100644
index 9e4eda27e2d8..000000000000
--- a/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 95c36b4f09eb3697877610a8a995befe32536b78 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Sun, 22 Aug 2021 14:16:56 +0200
-Subject: [PATCH] CMakeLists.txt: make docs optional
-
-Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
----
- CMakeLists.txt | 51 ++++++++++++++++++++++++++------------------------
- 1 file changed, 27 insertions(+), 24 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b2696d..cd56dc3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,6 +3,7 @@
- cmake_minimum_required(VERSION 3.5)
- project(metee)
-
-+option(BUILD_DOCS "Build docs" YES)
- option(BUILD_TEST "Build self-test" NO)
- option(BUILD_SAMPLES "Build samples" NO)
- option(BUILD_MSVC_RUNTIME_STATIC "Build with static runtime libraries on MSVC"
-@@ -43,32 +44,34 @@ install(
- )
-
- # Documentation
--find_package(Doxygen)
--if(DOXYGEN_FOUND)
-- set(DOXYGEN_INPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-- set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-- configure_file(
-- ${CMAKE_CURRENT_SOURCE_DIR}/include/Doxyfile.in
-- ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
-- )
--
-- add_custom_target(
-- doc ALL
-- ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-- COMMENT "Generating documentation with Doxygen"
-- VERBATIM
-- )
--
-- if(UNIX)
-- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/man3
-- DESTINATION ${CMAKE_INSTALL_MANDIR}
-+if(BUILD_DOCS)
-+ find_package(Doxygen)
-+ if(DOXYGEN_FOUND)
-+ set(DOXYGEN_INPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-+ set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-+ configure_file(
-+ ${CMAKE_CURRENT_SOURCE_DIR}/include/Doxyfile.in
-+ ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
- )
-- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-- DESTINATION ${CMAKE_INSTALL_DOCDIR}
-+
-+ add_custom_target(
-+ doc ALL
-+ ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+ COMMENT "Generating documentation with Doxygen"
-+ VERBATIM
- )
-- else()
-- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc)
-+
-+ if(UNIX)
-+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/man3
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}
-+ )
-+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}
-+ )
-+ else()
-+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc)
-+ endif()
- endif()
- endif()
-
diff --git a/dev-libs/metee/metee-3.1.0.ebuild b/dev-libs/metee/metee-3.1.0.ebuild
deleted file mode 100644
index 25509cef0437..000000000000
--- a/dev-libs/metee/metee-3.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Cross-platform access library for Intel CSME HECI interface"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/${PN}-3.1.0-make-docs-optional.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_DOCS="$(usex doc)"
- -DBUILD_SAMPLES="NO"
- -DBUILD_SHARED_LIBS="YES"
- -DBUILD_TEST="NO"
- -DCONSOLE_OUTPUT="NO"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-05-24 2:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-24 2:22 [gentoo-commits] repo/gentoo:master commit in: dev-libs/metee/files/, dev-libs/metee/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-03-12 11:52 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox