From c5c5d10d1b2ac0a589102315840c4f2a075b18c1 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Sat, 25 Oct 2025 17:42:11 +0200
Subject: Enable the new solver by default in 0.31, 1.21, 2.11, 3.1

Enable the new solver by default and remove the vendor-specific
configuration change in Ubuntu's drop-in.
---
 test/integration/run-tests | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'test/integration')

diff --git a/test/integration/run-tests b/test/integration/run-tests
index 9399f28e9..f5f6b6c57 100755
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -2,6 +2,8 @@
 set -e
 
 TESTTORUN=''
+export APT_SOLVER="${APT_SOLVER:-3.0}"
+export APT_SKIP_TEST_FILE="${APT_SKIP_TEST_FILE:-solver3.broken}"
 while [ -n "$1" ]; do
 	if [ "$1" = "-q" ]; then
 		export MSGLEVEL=2
@@ -24,6 +26,7 @@ while [ -n "$1" ]; do
 		shift
 	elif [ "$1" = '--solver' ]; then
 		export APT_SOLVER="$2"
+		unset APT_SKIP_TEST_FILE
 		shift
 	elif [ "$1" = '--skip' ]; then
 		export APT_SKIP_TEST_FILE="$2"
-- 
cgit v1.2.3-70-g09d2