From b4cfa0c5892ed5c9d39a1389f1d37d0d1486a409 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 18 Jun 2013 13:06:39 +0300 Subject: [PATCH] Adjust flangtest to work as a test-case for zero-length files (cherry picked from commit 2427d0fbf6b209e80e0c44eb2b63ecb028d058dc) --- tests/Makefile.am | 2 +- tests/data/SPECS/flangtest.spec | 2 ++ tests/rpmdb.at | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index e162cec..0456c32 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -106,7 +106,7 @@ testing$(bindir)/rpmbuild: ../rpmbuild for node in stdin stderr stdout null; do ln -s /dev/$${node} testing/dev/$${node}; done for cf in hosts resolv.conf passwd shadow group gshadow mtab fstab; do [ -f /etc/$${cf} ] && ln -s /etc/$${cf} testing/etc/$${cf}; done ln -s ../$(bindir) testing/usr/bin - for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file mktemp cut sort diff; do p=`which $${prog}`; ln -s $${p} testing/$${p}; done + for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file mktemp cut sort diff touch; do p=`which $${prog}`; ln -s $${p} testing/$${p}; done for d in /proc /sys /selinux /etc/selinux; do if [ -d $${d} ]; then ln -s $${d} testing/$${d}; fi; done (cd testing/magic && file -C) diff --git a/tests/data/SPECS/flangtest.spec b/tests/data/SPECS/flangtest.spec index a48ba39..a361bcd 100644 --- a/tests/data/SPECS/flangtest.spec +++ b/tests/data/SPECS/flangtest.spec @@ -19,6 +19,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} for f in fi de en pl none; do echo "This is $f language" > $RPM_BUILD_ROOT/%{_datadir}/%{name}/$f.txt done +touch $RPM_BUILD_ROOT/%{_datadir}/%{name}/empty.txt %clean rm -rf $RPM_BUILD_ROOT @@ -30,3 +31,4 @@ rm -rf $RPM_BUILD_ROOT %lang(en) %{_datadir}/%{name}/en.txt %lang(pl) %{_datadir}/%{name}/pl.txt %{_datadir}/%{name}/none.txt +%{_datadir}/%{name}/empty.txt diff --git a/tests/rpmdb.at b/tests/rpmdb.at index 9610252..f43f621 100644 --- a/tests/rpmdb.at +++ b/tests/rpmdb.at @@ -226,6 +226,7 @@ runroot rpm -qls flangtest ], [0], [normal /usr/share/flangtest/de.txt +normal /usr/share/flangtest/empty.txt not installed /usr/share/flangtest/en.txt normal /usr/share/flangtest/fi.txt normal /usr/share/flangtest/none.txt -- 2.7.4