- adapt tests to rpm 4.6:

  o old suggests format is no more handled
  o buildroot handling changed
  o build directories for root changed
- fix buildroot_default.spec: was broken since %{rpm_version} is not defined

8 files changed, 4 insertions, 93 deletions

diff --git a/MANIFEST b/MANIFEST
index c0a2604a..de6d0bf5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -119,9 +119,7 @@ t/data/SPECS/best-versioned-provide/a_ee.spec
 t/data/SPECS/best-versioned-provide/b1.spec
 t/data/SPECS/best-versioned-provide/b2.spec
 t/data/SPECS/best-versioned-provide/b3.spec
-t/data/SPECS/buildroot_BuildRoot.spec
 t/data/SPECS/buildroot_default.spec
-t/data/SPECS/buildroot_define.spec
 t/data/SPECS/dropped-provides/a1.spec
 t/data/SPECS/dropped-provides/a2.spec
 t/data/SPECS/dropped-provides/aa.spec
diff --git a/t/02create_pkgs.t b/t/02create_pkgs.t
index 9e567937..81f282d6 100644
--- a/t/02create_pkgs.t
+++ b/t/02create_pkgs.t
@@ -13,9 +13,6 @@ foreach (qw(media tmp tmp/BUILD tmp/RPMS tmp/RPMS/noarch tmp/SRPMS)) {
 }
 my $genhdlist2 = 'genhdlist2 --xml-info';
 
-mkdir "media/suggests";
-system_("cp data/old-suggests-1-1.noarch.rpm media/suggests");
-
 # locally build test rpms
 
 foreach my $dir (grep { -d $_ } glob("data/SPECS/*")) {
diff --git a/t/data/SPECS/buildroot_BuildRoot.spec b/t/data/SPECS/buildroot_BuildRoot.spec
deleted file mode 100644
index bf686480..00000000
--- a/t/data/SPECS/buildroot_BuildRoot.spec
+++ /dev/null
@@ -1,39 +0,0 @@
-%define macro_using_buildroot $(echo %buildroot)
-
-Summary: x
-Name: buildroot_BuildRoot
-Version: 1
-Release: 1
-License: x
-Group: x
-Url: x
-BuildRoot: %{_tmppath}/TESTING-%{version}-%{release}
-
-%description
-x
-
-%package sub
-
-Summary: x
-Group: x
-Version: 2
-Release: 2
-
-%description sub
-x
-
-%install
-%if %{rpm_version} >= 500
-echo This is Mandriva specific, skipping it for rpm5.org...
-%else
-wanted=$(echo %{_tmppath}/TESTING-1-1 | sed 's!//!/!')
-[ "%buildroot" = $wanted ] || { echo "buildroot should be $wanted instead of %buildroot"; exit 1; }
-[ "$RPM_BUILD_ROOT" = $wanted ] || { echo "RPM_BUILD_ROOT should be $wanted instead of $RPM_BUILD_ROOT"; exit 1; }
-[ "%macro_using_buildroot" = $wanted ] || { echo "macro_using_buildroot should be $wanted instead of %buildroot"; exit 1; }
-%endif
-
-install -d $RPM_BUILD_ROOT/etc
-echo foo > $RPM_BUILD_ROOT/etc/foo
-
-%files
-/etc/foo
diff --git a/t/data/SPECS/buildroot_default.spec b/t/data/SPECS/buildroot_default.spec
index 94f10ded..11d2f686 100644
--- a/t/data/SPECS/buildroot_default.spec
+++ b/t/data/SPECS/buildroot_default.spec
@@ -22,14 +22,10 @@ Release: 2
 x
 
 %install
-%if %{rpm_version} >= 500
-echo This is Mandriva specific, skipping it for rpm5.org...
-%else
-wanted=$(echo %{_tmppath}/buildroot-1-1-buildroot | sed 's!//!/!')
+wanted=$(echo %{_buildrootdir}/buildroot-1-1.%{_arch} | sed 's!//!/!')
 [ "%buildroot" = $wanted ] || { echo "buildroot should be $wanted instead of %buildroot"; exit 1; }
 [ "$RPM_BUILD_ROOT" = $wanted ] || { echo "RPM_BUILD_ROOT should be $wanted instead of $RPM_BUILD_ROOT"; exit 1; }
 [ "%macro_using_buildroot" = $wanted ] || { echo "macro_using_buildroot should be $wanted instead of %buildroot"; exit 1; }
-%endif
 
 install -d $RPM_BUILD_ROOT/etc
 echo foo > $RPM_BUILD_ROOT/etc/foo
diff --git a/t/data/SPECS/buildroot_define.spec b/t/data/SPECS/buildroot_define.spec
deleted file mode 100644
index bc78ba83..00000000
--- a/t/data/SPECS/buildroot_define.spec
+++ /dev/null
@@ -1,36 +0,0 @@
-%define macro_using_buildroot $(echo %buildroot)
-
-%define buildroot %{_tmppath}/TESTING
-
-Summary: x
-Name: buildroot_define
-Version: 1
-Release: 1
-License: x
-Group: x
-Url: x
-
-%description
-x
-
-%package sub
-
-Summary: x
-Group: x
-Version: 2
-
-%description sub
-x
-
-
-%install
-wanted=%{_tmppath}/TESTING
-[ "%buildroot" = $wanted ] || { echo "buildroot should be $wanted instead of %buildroot"; exit 1; }
-[ "$RPM_BUILD_ROOT" = $wanted ] || { echo "RPM_BUILD_ROOT should be $wanted instead of $RPM_BUILD_ROOT"; exit 1; }
-[ "%macro_using_buildroot" = $wanted ] || { echo "macro_using_buildroot should be $wanted instead of %buildroot"; exit 1; }
-
-install -d $RPM_BUILD_ROOT/etc
-echo foo > $RPM_BUILD_ROOT/etc/foo
-
-%files
-/etc/foo
diff --git a/t/data/old-suggests-1-1.noarch.rpm b/t/data/old-suggests-1-1.noarch.rpm
deleted file mode 100644
index 628a70e9..00000000
--- a/t/data/old-suggests-1-1.noarch.rpm
+++ /dev/null
diff --git a/t/superuser--srpm-bootstrapping.t b/t/superuser--srpm-bootstrapping.t
index a6c21a26..ff614718 100644
--- a/t/superuser--srpm-bootstrapping.t
+++ b/t/superuser--srpm-bootstrapping.t
@@ -28,11 +28,11 @@ sub test {
 sub install_src_rpm {
     my ($para) = @_;
     
-    system_('mkdir -p root/usr/src/rpm/SOURCES');
+    system_('mkdir -p root/root/rpmbuild/SOURCES');
 
-    $ENV{HOME} = '/';
+    $ENV{HOME} = '/root';
     urpmi("--install-src $para");
 
-    system_("cmp root/usr/src/rpm/SPECS/$name.spec data/SPECS/$name.spec");
+    system_("cmp root/root/rpmbuild/SPECS/$name.spec data/SPECS/$name.spec");
     system_('rm -rf root/usr/src/rpm');
 }
diff --git a/t/superuser--suggests.t b/t/superuser--suggests.t
index 6a7b97ca..109c1df9 100644
--- a/t/superuser--suggests.t
+++ b/t/superuser--suggests.t
@@ -30,7 +30,6 @@ test_invalid();
 test_upgrade();
 test_d();
 test_force_suggests();
-test_old_suggests();
 
 sub test_b {
     test('b', ['bb'], ['suggested_b']);
@@ -48,10 +47,6 @@ sub test_invalid {
     check_installed_and_remove('with-invalid');
 }
 
-sub test_old_suggests {
-    test('old-suggests', [], ['suggested_b']);
-}
-
 sub test {
     my ($name, $required, $suggested) = @_;
     urpmi("--no-suggests --auto $name");