git: 8cb78e3688bf - main - Mk/Uses/qt.mk: Add TEST_DEPENDS support
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 06 Mar 2025 06:34:25 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8cb78e3688bfff02884ba00a7d1a6755a0a99642
commit 8cb78e3688bfff02884ba00a7d1a6755a0a99642
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-03-06 04:37:19 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-03-06 06:34:16 +0000
Mk/Uses/qt.mk: Add TEST_DEPENDS support
It is now possible to suffix a component defined in USE_QT with ':test'
if it is only needed for building/running regession tests.
---
CHANGES | 14 ++++++++++++++
Mk/Uses/qt.mk | 14 ++++++++++----
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/CHANGES b/CHANGES
index a6af122cf8f1..e28cfeb8c787 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,20 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
+20250306:
+AUTHOR: jhale@FreeBSD.org
+
+ TEST_DEPENDS support has been added to Mk/Uses/qt.mk.
+
+ If a component defined by USE_QT is only needed for regession tests,
+ it can be added to TEST_DEPENDS buy suffixing it with ':test'.
+
+ For example:
+ USES= qt:5
+ USE_QT= testlib:test
+
+ Will add devel/qt5-testlib to TEST_DEPENDS
+
20250205:
AUTHOR: yasu@FreeBSD.org
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 01b01d38cae5..0717986716b7 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -11,9 +11,9 @@
# Versions: 5, 6
#
# Port variables:
-# USE_QT - List of Qt modules to depend on, with optional ':build'
-# and ':run' suffixes. Define it empty to include this file
-# without depending on Qt ports.
+# USE_QT - List of Qt modules to depend on, with optional ':build',
+# ':run', and ':test' suffixes. Define it empty to include
+# this file without depending on Qt ports.
#
# MAINTAINER: kde@FreeBSD.org
@@ -444,7 +444,7 @@ _USE_QT_ALL= ${_USE_QT_COMMON} \
${_USE_QT${_QT_VER}_ONLY}
_USE_QT= ${USE_QT}
# Iterate through components deprived of suffix.
-. for component in ${_USE_QT:O:u:C/:(build|run)$//}
+. for component in ${_USE_QT:O:u:C/:(build|run|test)$//}
# Check that the component is valid.
. if ${_USE_QT_ALL:M${component}} != ""
# Skip meta-components (currently none).
@@ -458,6 +458,9 @@ qt-${component}_TYPE+= build
. if ${_USE_QT:M${component}\:run} != ""
qt-${component}_TYPE+= run
. endif
+. if ${_USE_QT:M${component}\:test} != ""
+qt-${component}_TYPE+= test
+. endif
. endif # ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
# If no dependency type is set, default to full dependency.
. if !defined(qt-${component}_TYPE)
@@ -475,6 +478,9 @@ BUILD_DEPENDS+= ${qt-${component}_DEPENDS}
. if ${qt-${component}_TYPE:Mrun} != ""
RUN_DEPENDS+= ${qt-${component}_DEPENDS}
. endif
+. if ${qt-${component}_TYPE:Mtest} != ""
+TEST_DEPENDS+= ${qt-${component}_DEPENDS}
+. endif
. endif # ${qt-${component}_LIB} && ${qt-${component}_TYPE:Mbuild} && ${qt-${component}_TYPE:Mrun}
. endif # defined(qt-${component}_PORT) && defined(qt-${component}_PATH)
. else # ! ${_USE_QT_ALL:M${component}} != ""