Merge dependency tests sharing built material to common groups

(cherry picked from commit 896dc31dea08e9531211ad77a4eb0e4fae92233b)

1 files changed, 110 insertions, 268 deletions

diff --git a/tests/rpmdeps.at b/tests/rpmdeps.at
index 91857e50b..67bde1dc8 100644
--- a/tests/rpmdeps.at
+++ b/tests/rpmdeps.at
@@ -3,10 +3,8 @@
 AT_BANNER([RPM dependencies])
 
 # ------------------------------
-# 
-AT_SETUP([missing dependency])
-AT_KEYWORDS([install])
-AT_CHECK([
+AT_SETUP([unversioned requires])
+AT_KEYWORDS([install depends])
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -14,6 +12,15 @@ runroot rpmbuild --quiet -bb \
 	--define "reqs deptest-two" \
 	  /data/SPECS/deptest.spec
 
+runroot rpmbuild --quiet -bb \
+	--define "pkg two" \
+	--define "reqs deptest-one" \
+	  /data/SPECS/deptest.spec
+
+# missing dependency
+AT_CHECK([
+RPMDB_INIT
+
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 ],
 [1],
@@ -21,25 +28,11 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 [error: Failed dependencies:
 	deptest-two is needed by deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-# ------------------------------
-# 
-AT_SETUP([cross-depending packages])
-AT_KEYWORDS([install])
+# cross-depending packages
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs deptest-two" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	--define "reqs deptest-one" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [0],
@@ -107,9 +100,8 @@ AT_CLEANUP
 
 # ------------------------------
 # 
-AT_SETUP([versioned conflict in transaction])
+AT_SETUP([versioned conflicts])
 AT_KEYWORDS([install])
-AT_CHECK([
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -121,6 +113,10 @@ runroot rpmbuild --quiet -bb \
 	--define "pkg two" \
 	  /data/SPECS/deptest.spec
 
+# versioned conflict in transaction
+AT_CHECK([
+RPMDB_INIT
+
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [2],
@@ -128,24 +124,11 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarc
 [error: Failed dependencies:
 	deptest-two < 2.0 conflicts with deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-# ------------------------------
-# 
-AT_SETUP([versioned conflict in database])
-AT_KEYWORDS([install])
+# versioned conflict in database
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "cfls deptest-two < 2.0" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 runroot rpm -U /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
@@ -292,11 +275,10 @@ AT_CLEANUP
 
 # ------------------------------
 #
-AT_SETUP([unsatisfied WITH require])
+AT_SETUP([unsatisfied WITH requires])
 AT_KEYWORDS([install, boolean])
-AT_CHECK([
-RPMDB_INIT
 
+RPMDB_INIT
 runroot rpmbuild --quiet -bb \
 	--define "pkg one" \
 	--define "reqs (deptest-two with flavor = dekstop)" \
@@ -312,6 +294,10 @@ runroot rpmbuild --quiet -bb \
 	--define "provs flavor = desktop" \
 	  /data/SPECS/deptest.spec
 
+# unsatisfied WITH require in transaction
+AT_CHECK([
+RPMDB_INIT
+
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm
 ],
 [3],
@@ -319,28 +305,11 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarc
 [error: Failed dependencies:
 	(deptest-two with flavor = dekstop) is needed by deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-AT_SETUP([unsatisfied WITH require (rpmdb)])
-AT_KEYWORDS([install, boolean])
+# unsatisfied WITH require in rpmdb
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two with flavor = dekstop)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	--define "provs flavor = server" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg three" \
-	--define "provs flavor = desktop" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm
 
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
@@ -352,9 +321,8 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 ])
 AT_CLEANUP
 
-AT_SETUP([satisfied WITH require])
+AT_SETUP([satisfied WITH requires])
 AT_KEYWORDS([install, boolean])
-AT_CHECK([
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -367,15 +335,16 @@ runroot rpmbuild --quiet -bb \
 	--define "provs flavor = desktop" \
 	  /data/SPECS/deptest.spec
 
+# satisfied WITH require in transaction
+AT_CHECK([
+RPMDB_INIT
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [0],
 [],
 [])
-AT_CLEANUP
 
-AT_SETUP([satisfied WITH require (rpmdb)])
-AT_KEYWORDS([install, boolean])
+# satisfied WITH require in rpmdb
 AT_CHECK([
 RPMDB_INIT
 
@@ -400,9 +369,8 @@ AT_CLEANUP
 
 # ------------------------------
 #
-AT_SETUP([unsatisfied WITHOUT require])
+AT_SETUP([unsatisfied WITHOUT requires])
 AT_KEYWORDS([install, boolean])
-AT_CHECK([
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -415,6 +383,10 @@ runroot rpmbuild --quiet -bb \
 	--define "provs flavor = server" \
 	  /data/SPECS/deptest.spec
 
+# unsatisfied WITHOUT require in transaction
+AT_CHECK([
+RPMDB_INIT
+
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [2],
@@ -422,23 +394,11 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarc
 [error: Failed dependencies:
 	(deptest-two without flavor) is needed by deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-AT_SETUP([unsatisfied WITHOUT require (rpmdb)])
-AT_KEYWORDS([install, boolean])
+# unsatisfied WITHOUT require in rpmdb
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two without flavor)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	--define "provs flavor = server" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
@@ -450,9 +410,8 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 ])
 AT_CLEANUP
 
-AT_SETUP([satisfied WITHOUT require])
+AT_SETUP([satisfied WITHOUT requires])
 AT_KEYWORDS([install, boolean])
-AT_CHECK([
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -464,27 +423,20 @@ runroot rpmbuild --quiet -bb \
 	--define "pkg two" \
 	  /data/SPECS/deptest.spec
 
+# satisfied WITHOUT require in transaction
+AT_CHECK([
+RPMDB_INIT
+
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [0],
 [],
 [])
-AT_CLEANUP
 
-AT_SETUP([satisfied WITHOUT require (rpmdb)])
-AT_KEYWORDS([install, boolean])
+# satisfied WITHOUT require in rpmdb
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two without flavor)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
@@ -496,9 +448,8 @@ AT_CLEANUP
 
 # ------------------------------
 #
-AT_SETUP([unsatisfied AND require - all missing])
+AT_SETUP([AND requires])
 AT_KEYWORDS([install, boolean])
-AT_CHECK([
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -506,6 +457,15 @@ runroot rpmbuild --quiet -bb \
 	--define "reqs (deptest-two and deptest-three)" \
 	  /data/SPECS/deptest.spec
 
+for pkg in two three; do
+    runroot rpmbuild --quiet -bb \
+	--define "pkg ${pkg}" \
+	  /data/SPECS/deptest.spec
+done
+
+AT_CHECK([
+RPMDB_INIT
+# unsatisfied AND require - all missing
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 ],
 [1],
@@ -513,22 +473,11 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 [error: Failed dependencies:
 	(deptest-two and deptest-three) is needed by deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-AT_SETUP([unsatisfied AND require - first is missing])
-AT_KEYWORDS([install, boolean])
+# unsatisfied AND require - first is missing
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two and deptest-three)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg three" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm
 ],
 [2],
@@ -536,22 +485,11 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarc
 [error: Failed dependencies:
 	(deptest-two and deptest-three) is needed by deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-AT_SETUP([unsatisfied AND require - second is missing])
-AT_KEYWORDS([install, boolean])
+# unsatisfied AND require - second is missing
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two and deptest-three)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [2],
@@ -559,26 +497,11 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarc
 [error: Failed dependencies:
 	(deptest-two and deptest-three) is needed by deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-AT_SETUP([satisfied AND require])
-AT_KEYWORDS([install, boolean])
+# satisfied AND require
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two and deptest-three)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg three" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm
 ],
 [0],
@@ -588,9 +511,8 @@ AT_CLEANUP
 
 # ------------------------------
 #
-AT_SETUP([unsatisfied OR require - all missing])
+AT_SETUP([OR requires])
 AT_KEYWORDS([install, boolean])
-AT_CHECK([
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -598,6 +520,15 @@ runroot rpmbuild --quiet -bb \
 	--define "reqs (deptest-two or deptest-three)" \
 	  /data/SPECS/deptest.spec
 
+for pkg in two three; do
+    runroot rpmbuild --quiet -bb \
+	--define "pkg ${pkg}" \
+	  /data/SPECS/deptest.spec
+done
+
+# unsatisfied OR require - all missing
+AT_CHECK([
+RPMDB_INIT
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 ],
 [1],
@@ -605,68 +536,31 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 [error: Failed dependencies:
 	(deptest-two or deptest-three) is needed by deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-AT_SETUP([satisfied OR require - first is missing])
-AT_KEYWORDS([install, boolean])
+# satisfied OR require - first is missing
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two or deptest-three)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg three" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm
 ],
 [0],
 [],
 [])
-AT_CLEANUP
 
-AT_SETUP([satisfied OR require - second is missing])
-AT_KEYWORDS([install, boolean])
+# satisfied OR require - second is missing
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two or deptest-three)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [0],
 [],
 [])
-AT_CLEANUP
 
-AT_SETUP([satisfied OR require - both present])
-AT_KEYWORDS([install, boolean])
+# satisfied OR require - both present
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two or deptest-three)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg three" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm
 ],
 [0],
@@ -676,9 +570,8 @@ AT_CLEANUP
 
 # ------------------------------
 #
-AT_SETUP([unsatisfied IF require])
+AT_SETUP([IF requires])
 AT_KEYWORDS([install, boolean])
-AT_CHECK([
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -686,9 +579,15 @@ runroot rpmbuild --quiet -bb \
 	--define "reqs (deptest-two if deptest-three)" \
 	  /data/SPECS/deptest.spec
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg three" \
+for pkg in two three; do
+    runroot rpmbuild --quiet -bb \
+	--define "pkg ${pkg}" \
 	  /data/SPECS/deptest.spec
+done
+
+# unsatisfied IF require
+AT_CHECK([
+RPMDB_INIT
 
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm
 ],
@@ -697,26 +596,11 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarc
 [error: Failed dependencies:
 	(deptest-two if deptest-three) is needed by deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-AT_SETUP([satisfied IF require])
-AT_KEYWORDS([install, boolean])
+# satisfied IF require
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two if deptest-three)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg three" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [0],
@@ -724,9 +608,8 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarc
 [])
 AT_CLEANUP
 
-AT_SETUP([unsatisfied IF-ELSE require])
+AT_SETUP([IF-ELSE requires])
 AT_KEYWORDS([install, boolean])
-AT_CHECK([
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -734,6 +617,16 @@ runroot rpmbuild --quiet -bb \
 	--define "reqs (deptest-two if deptest-three else deptest-four)" \
 	  /data/SPECS/deptest.spec
 
+for pkg in two three four; do
+    runroot rpmbuild --quiet -bb \
+	--define "pkg ${pkg}" \
+	  /data/SPECS/deptest.spec
+done
+
+# unsatisfied IF-ELSE require
+AT_CHECK([
+RPMDB_INIT
+
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 ],
 [1],
@@ -741,47 +634,21 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm
 [error: Failed dependencies:
 	(deptest-two if deptest-three else deptest-four) is needed by deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-AT_SETUP([satisfied IF-ELSE require - right clause])
-AT_KEYWORDS([install, boolean])
+# satisfied IF-ELSE require - right clause
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two if deptest-three else deptest-four)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg four" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-four-1.0-1.noarch.rpm
 ],
 [0],
 [],
 [])
-AT_CLEANUP
 
-AT_SETUP([satisfied IF-ELSE require - left clause])
-AT_KEYWORDS([install, boolean])
+# satisfied IF-ELSE require - left clause
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two if deptest-three else deptest-four)" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg three" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [0],
@@ -791,9 +658,8 @@ AT_CLEANUP
 
 # ------------------------------
 #
-AT_SETUP([unsatisfied nested AND-OR require])
+AT_SETUP([nested AND-OR requires])
 AT_KEYWORDS([install, boolean])
-AT_CHECK([
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -801,10 +667,15 @@ runroot rpmbuild --quiet -bb \
 	--define "reqs (deptest-two and (deptest-three or deptest-four))" \
 	  /data/SPECS/deptest.spec
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
+for pkg in two three; do
+    runroot rpmbuild --quiet -bb \
+	--define "pkg ${pkg}" \
 	  /data/SPECS/deptest.spec
+done
 
+AT_CHECK([
+RPMDB_INIT
+# unsatisfied nested AND-OR require
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [2],
@@ -812,26 +683,11 @@ runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarc
 [error: Failed dependencies:
 	(deptest-two and (deptest-three or deptest-four)) is needed by deptest-one-1.0-1.noarch
 ])
-AT_CLEANUP
 
-AT_SETUP([satisfied nested AND-OR require])
-AT_KEYWORDS([install, boolean])
+# satisfied nested AND-OR require
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two and (deptest-three or deptest-four))" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg three" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm
 ],
 [0],
@@ -841,9 +697,8 @@ AT_CLEANUP
 
 # ------------------------------
 #
-AT_SETUP([satisfied nested AND-IF require - without right clause])
+AT_SETUP([nested AND-IF requires])
 AT_KEYWORDS([install, boolean])
-AT_CHECK([
 RPMDB_INIT
 
 runroot rpmbuild --quiet -bb \
@@ -851,39 +706,26 @@ runroot rpmbuild --quiet -bb \
 	--define "reqs (deptest-two and (deptest-three if deptest-four))" \
 	  /data/SPECS/deptest.spec
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
+for pkg in two three four; do
+    runroot rpmbuild --quiet -bb \
+	--define "pkg ${pkg}" \
 	  /data/SPECS/deptest.spec
+done
+
+# satisfied nested AND-IF require - without right clause
+AT_CHECK([
+RPMDB_INIT
 
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm
 ],
 [0],
 [],
 [])
-AT_CLEANUP
 
-AT_SETUP([satisfied nested AND-IF require - with right clause])
-AT_KEYWORDS([install, boolean])
+# satisfied nested AND-IF require - with right clause
 AT_CHECK([
 RPMDB_INIT
 
-runroot rpmbuild --quiet -bb \
-	--define "pkg one" \
-	--define "reqs (deptest-two and (deptest-three if deptest-four))" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg two" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg four" \
-	  /data/SPECS/deptest.spec
-
-runroot rpmbuild --quiet -bb \
-	--define "pkg three" \
-	  /data/SPECS/deptest.spec
-
 runroot rpm -U /build/RPMS/noarch/deptest-one-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-two-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-four-1.0-1.noarch.rpm /build/RPMS/noarch/deptest-three-1.0-1.noarch.rpm
 ],
 [0],