- Don't use multibuild.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=352

_multibuild

@@ -1,3 +0,0 @@
-<multibuild>
-  <package>testsuite</package>
-</multibuild>

gdb.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr  4 11:29:35 UTC 2023 - Tom de Vries <tdevries@suse.com>
+
+- Don't use multibuild.
+
 -------------------------------------------------------------------
 Tue Apr  4 08:47:10 UTC 2023 - Tom de Vries <tdevries@suse.com>
 

gdb.spec

@@ -17,7 +17,7 @@
 #
 
 
-%define flavor @BUILD_FLAVOR@%{nil}
+%define flavor %{nil}
 
 %bcond_with ringdisabled
 %bcond_with for_chroot
@@ -144,6 +144,7 @@ Source16:       qa.sh
 Source17:       qa-local.sh
 Source18:       qa-remote.sh
 Source19:       README.qa
+Source20:       pre_checkin.sh
 
 %if %{build_testsuite}
 NoSource:       0
@@ -162,6 +163,7 @@ NoSource:       16
 NoSource:       17
 NoSource:       18
 NoSource:       19
+NoSource:       20
 %endif
 
 # Fedora import from branch f36, commit 89947a7 "Rebase to FSF GDB 12.1."

pre_checkin.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+for flavor in %{nil} testsuite; do
+    case $flavor in
+	%{nil})
+	    file=gdb.spec
+	    ;;
+	testsuite)
+	    file=gdb-testresults.spec
+	    ;;
+	*)
+	    echo "unknown flavor: $flavor"
+	    ;;
+	esac
+
+    sed "s/^%define flavor .*$/%define flavor $flavor/" gdb.spec.in > $file
+done
+
+osc service localrun format_spec_file
+
+diff -I "^%define flavor " gdb.spec.in gdb.spec
+
+diff -I "^%define flavor " gdb.spec.in gdb-testresults.spec

qa-local.sh

@@ -106,6 +106,7 @@ case "$n" in
 		    --trust-all-projects \
 		    --no-service \
 		    $c $arch \
+		    gdb.spec \
 		    > $logs/$n/LOG.$c.$arch \
 		    2>&1
 
@@ -138,8 +139,8 @@ case "$n" in
 		    --trust-all-projects \
 		    --no-service \
 		    -k $pkgs/$c.$arch \
-		    -M testsuite \
 		    $c $arch \
+		    gdb-testressults.spec \
 		    > $logs/$n/LOG.$c.$arch \
 		    2>&1
 		if [ $? -eq 0 ]; then