bulld and qa: re-enable Qt5 and in particular pmchart for FreeBSD 14

vm10 is the winner.
performancecopilot · Jul 18, 2024 · 6ceb994 · 6ceb994
1 parent b61dbbc
commit 6ceb994
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/Makepkgs b/Makepkgs
@@ -272,8 +272,9 @@ then
     # Python build does not work on FreeBSD 9.3, so skip it
     # For FreeBSD 10.4 and 11.3 it seems to fail when trying to build
     # Python and Python3 at the same time ... so skip Python(2)
-    # For FreeBSD 13 and 14 I don't have Qt working and cppcheck => Qt installed,
-    # and dtrace/static probes is not working
+    # For FreeBSD 13 I don't have Qt working
+    # For FreeBSD 14 cppcheck => Qt installed and dtrace/static probes
+    # is not working
     #
     case `uname -r`
     in
@@ -292,11 +293,16 @@ then
 		#
 		configopts="--sysconfdir=/etc --localstatedir=/var --with-python=no --with-static-probes=no --prefix=/usr"
 		;;
-	13.*|14.*)
+	13.*)
 		# Bog-standard, just without python2 and qt and static probes
 		#
 		configopts="--sysconfdir=/etc --localstatedir=/var --with-python=no --with-qt=no --with-static-probes=no --prefix=/usr"
 		;;
+	14.*)
+		# Bog-standard, just without python2 and static probes
+		#
+		configopts="--sysconfdir=/etc --localstatedir=/var --with-python=no --with-static-probes=no --prefix=/usr"
+		;;
 	*)
 		# Bog-standard, as below ...
 		#

diff --git a/qa/admin/myconfigure b/qa/admin/myconfigure
@@ -149,11 +149,16 @@ then
 		#
 		configopts="--sysconfdir=/etc --localstatedir=/var --with-python=no --with-static-probes=no --prefix=/usr"
 		;;
-	13.*|14.*)
+	13.*)
 		# Bog-standard, just without python2 and qt and static-probes
 		#
 		configopts="--sysconfdir=/etc --localstatedir=/var --with-python=no --with-qt=no --with-static-probes=no --prefix=/usr"
 		;;
+	14.*)
+		# Bog-standard, just without python2 and static-probes
+		#
+		configopts="--sysconfdir=/etc --localstatedir=/var --with-python=no --with-static-probes=no --prefix=/usr"
+		;;
 	*)
 		# default case, as below ...
 		#

diff --git a/qa/admin/other-packages/manifest b/qa/admin/other-packages/manifest
@@ -1558,7 +1558,7 @@ rpm?		/usr/lib*/libdrm.so.*		[libdrm-devel or libdrm2-devel (QA optional)]
 emerge?		?				[? (QA optional)]
 pkgin?		?				[? (QA optional)]
 pkg_add?	?				[? (QA optional)]
-F_pkg?		?				[? (QA optional)]
+F_pkg?		libdrm.so			[N/A (QA optional)]
 S_pkg?		?				[? (QA optional)]
 slackpkg?	?				[N/A (QA optional)]
 pacman?		?				[? (QA optional)]

diff --git a/qa/admin/pcp-daily b/qa/admin/pcp-daily
@@ -838,7 +838,7 @@ do
 	vm10)
 	    # Only selected groups at this stage for FreeBSD ...
 	    #
-	    [ X"$what" = Xall ] && check_what='-g sanity -g trace -g libpcp -g kernel -g pmrep -g threads -g perl -x valgrind'
+	    [ X"$what" = Xall ] && check_what='-g sanity -g trace -g libpcp -g kernel -g pmrep -g threads -g perl -g pmchart -x valgrind'
 	    ;;
 
 	vm15)

diff --git a/qa/common.qt b/qa/common.qt
@@ -61,6 +61,8 @@ _filter_qt()
 	-e '/libGL error: failed to load driver: swrast/d' \
 	-e '/^MESA: error: ZINK: vkCreateInstance failed /d' \
 	-e '/^MESA: error: ZINK: failed to choose pdev/d' \
+	-e '/^MESA-LOADER: failed to open zink: Cannot open /d' \
+	-e '/^MESA-LOADER: failed to open swrast: Cannot open /d' \
 	-e '/^glx: failed to create drisw screen/d' \
 	-e '/^failed to load driver: zink/d' \
 	-e '/^qt.glx: qglx_findConfig: Failed to finding matching FBConfig for QSurfaceFormat/d' \