From bcf745cef02639c4c8d4d544ce386b98fc3c9597 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 21 Dec 2007 08:40:03 +0000 Subject: sync (otherwise broken) tests with HEAD --- t/data/SPECS/buildroot_BuildRoot.spec | 4 +++- t/data/SPECS/buildroot_default.spec | 6 ++++-- t/data/SPECS/buildroot_define.spec | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/t/data/SPECS/buildroot_BuildRoot.spec b/t/data/SPECS/buildroot_BuildRoot.spec index 2dce81c4..cc7b78ca 100644 --- a/t/data/SPECS/buildroot_BuildRoot.spec +++ b/t/data/SPECS/buildroot_BuildRoot.spec @@ -28,6 +28,8 @@ wanted=$(echo %{_tmppath}/TESTING-1-1 | sed 's!//!/!') [ "$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 +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 1924e847..e1fc7c78 100644 --- a/t/data/SPECS/buildroot_default.spec +++ b/t/data/SPECS/buildroot_default.spec @@ -22,11 +22,13 @@ Release: 2 x %install -wanted=%defaultbuildroot +wanted=$(echo %{_tmppath}/buildroot-1-1-buildroot | 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; } -install -d $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/etc +echo foo > $RPM_BUILD_ROOT/etc/foo %files +/etc/foo diff --git a/t/data/SPECS/buildroot_define.spec b/t/data/SPECS/buildroot_define.spec index 1b8cd33c..bc78ba83 100644 --- a/t/data/SPECS/buildroot_define.spec +++ b/t/data/SPECS/buildroot_define.spec @@ -29,6 +29,8 @@ wanted=%{_tmppath}/TESTING [ "$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 +install -d $RPM_BUILD_ROOT/etc +echo foo > $RPM_BUILD_ROOT/etc/foo %files +/etc/foo -- cgit v1.2.1