From 64fed6be0216c2158a2167e977b2b364a051692b Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 20 Sep 2021 15:04:37 +0200
Subject: [PATCH] Related: #2005874 - run upstream tests for both curl-minimal
 and curl-full

As we made libcurl-minimal more minimal, it differs more from
libcurl-full and it should be tested separately.  On the other
hand, the test-suite for libcurl-minimal runs faster now because
more tests are skipped.
---
 curl.spec | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/curl.spec b/curl.spec
index 6073878..74b7879 100644
--- a/curl.spec
+++ b/curl.spec
@@ -336,20 +336,33 @@ sed -e 's/^runpath_var=.*/runpath_var=/' \
 %make_build V=1 -C build-full
 
 %check
-# we have to override LD_LIBRARY_PATH because we eliminated rpath
-LD_LIBRARY_PATH="${PWD}/build-full/lib/.libs"
-export LD_LIBRARY_PATH
-
 # compile upstream test-cases
-cd build-full/tests
-%make_build V=1
+%make_build V=1 -C build-minimal/tests
+%make_build V=1 -C build-full/tests
 
 # relax crypto policy for the test-suite to make it pass again (#1610888)
 export OPENSSL_SYSTEM_CIPHERS_OVERRIDE=XXX
 export OPENSSL_CONF=
 
-# run the upstream test-suite
-srcdir=../../tests perl -I../../tests ../../tests/runtests.pl -a -p -v '!flaky'
+# make runtests.pl work for out-of-tree builds
+export srcdir=../../tests
+
+# prevent valgrind from being extremely slow (#1662656)
+# https://fedoraproject.org/wiki/Changes/DebuginfodByDefault
+unset DEBUGINFOD_URLS
+
+# run the upstream test-suite for both curl-minimal and curl-full
+for size in minimal full; do (
+    cd build-${size}
+
+    # we have to override LD_LIBRARY_PATH because we eliminated rpath
+    export LD_LIBRARY_PATH="${PWD}/lib/.libs"
+
+    cd tests
+    perl -I../../tests ../../tests/runtests.pl -a -p -v '!flaky'
+)
+done
+
 
 %install
 # install and rename the library that will be packaged as libcurl-minimal