diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/SPECS/deptest.spec | 4 | ||||
| -rw-r--r-- | tests/rpmbuild.at | 22 | ||||
| -rw-r--r-- | tests/rpmgeneral.at | 20 |
3 files changed, 6 insertions, 40 deletions
diff --git a/tests/data/SPECS/deptest.spec b/tests/data/SPECS/deptest.spec index 02616f8a4..7f2228f11 100644 --- a/tests/data/SPECS/deptest.spec +++ b/tests/data/SPECS/deptest.spec @@ -10,10 +10,6 @@ BuildArch: noarch %{?provs:Provides: %{provs}} %{?cfls:Conflicts: %{cfls}} %{?obs:Obsoletes: %{obs}} -%{?recs:Recommends: %{recs}} -%{?sugs:Suggests: %{sugs}} -%{?sups:Supplements: %{sups}} -%{?ens:Enhances: %{ens}} %description %{summary} diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at index b6a6ef02f..7661e35f5 100644 --- a/tests/rpmbuild.at +++ b/tests/rpmbuild.at @@ -185,25 +185,3 @@ lrwxrwxrwx /opt/globtest/linkgood ], []) AT_CLEANUP - -# ------------------------------ -# Check if weak and reverse requires can be built -AT_SETUP([Weak and reverse requires]) -AT_KEYWORDS([build]) -AT_CHECK([ - -runroot rpmbuild -bb --quiet \ - --define "pkg weakdeps" \ - --define "recs foo > 1.2.3" \ - --define "sugs bar >= 0.1.2" \ - --define "sups baz" \ - --define "ens zap = 3" \ - /data/SPECS/deptest.spec - -runroot rpm -qp --qf "[%{supplementname}\n]" /build/RPMS/noarch/deptest-weakdeps-1.0-1.noarch.rpm -], -[0], -[baz -], -[ignore]) -AT_CLEANUP diff --git a/tests/rpmgeneral.at b/tests/rpmgeneral.at index bdef73dea..eb0d86dda 100644 --- a/tests/rpmgeneral.at +++ b/tests/rpmgeneral.at @@ -79,10 +79,10 @@ DISTTAG DISTURL DSAHEADER E -ENHANCEFLAGS -ENHANCENAME ENHANCES -ENHANCEVERSION +ENHANCESFLAGS +ENHANCESNAME +ENHANCESVERSION EPOCH EPOCHNUM EVR @@ -203,10 +203,6 @@ PROVIDES PROVIDEVERSION PUBKEYS R -RECOMMENDFLAGS -RECOMMENDNAME -RECOMMENDS -RECOMMENDVERSION RECONTEXTS RELEASE REMOVETID @@ -227,15 +223,11 @@ SOURCE SOURCEPACKAGE SOURCEPKGID SOURCERPM -SUGGESTFLAGS -SUGGESTNAME SUGGESTS -SUGGESTVERSION +SUGGESTSFLAGS +SUGGESTSNAME +SUGGESTSVERSION SUMMARY -SUPPLEMENTFLAGS -SUPPLEMENTNAME -SUPPLEMENTS -SUPPLEMENTVERSION TRIGGERCONDS TRIGGERFLAGS TRIGGERINDEX |