RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 26-Sep-2010 05:07:50
Branch: rpm-5_3 Handle: 2010092603074900
Modified files: (Branch: rpm-5_3)
rpm/tests Makefile.am
Log:
- tests: fix: add .PRECIOUS, see if distro files are preserved on failure.
- tests: fix: oops, now is a variable, ot a command.
Summary:
Revision Changes Path
1.63.2.22 +10 -6 rpm/tests/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.63.2.21 -r1.63.2.22 Makefile.am
--- rpm/tests/Makefile.am 26 Sep 2010 00:52:27 -0000 1.63.2.21
+++ rpm/tests/Makefile.am 26 Sep 2010 03:07:49 -0000 1.63.2.22
@@ -462,6 +462,8 @@
UL \
YDL62 YDL61
+now = date -u --rfc-3339=seconds
+
manifests:
@echo "=== $@ ==="
@for D in ${DISTROS}; do \
@@ -469,6 +471,7 @@
make $${D}/manifest; \
done
+.PRECIOUS: %/manifest
%/manifest:
@echo "=== $@ ==="
@mkdir -p $(@D)
@@ -483,6 +486,7 @@
ls -l $...@d}/uri $@ $...@d}/distros.mongo; \
fi
+.PRECIOUS: %/RPMS
%/RPMS: %/manifest
@echo "=== $@ ==="
@if [ ! -d $@ ]; then \
@@ -491,28 +495,28 @@
cd $@ && ${wget} -c -i $(testdir)/$(@D)/manifest; \
fi
+.PRECIOUS: %/todo
%/todo: %/RPMS
@echo "=== $@ ==="
@if [ ! -f $@ ]; \
then ${find} $< -name '*.rpm' | sort -u > $@; \
fi
-now = date -u --rfc-3339=seconds
-
+.PRECIOUS: %/solve
%/solve: %/todo
@rm -f $...@d}/import
- @echo "`now` ==> $...@d}: Creating ..." | tee -a $...@d}/import
+ @echo "`${now}` ==> $...@d}: Creating ..." | tee -a $...@d}/import
@mkdir -p $@/log $@/tmp
@${cp} $(testdir)/ref/DB_CONFIG $@
- @echo "`now` <== $...@d}: Created." | tee -a $...@d}/import
- @echo "`now` ==> $...@d}: Importing ..." | tee -a $...@d}/import
+ @echo "`${now}` <== $...@d}: Created." | tee -a $...@d}/import
+ @echo "`${now}` ==> $...@d}: Importing ..." | tee -a $...@d}/import
@-${rpm} -i -D '_dbpath $...@d}/solve' --justdb --stats \
--replacepkgs --replacefiles --oldpackage \
--noaid --ignoresize --nodeps --noorder \
--noscripts --notriggers --noparentdirs --nolinktos \
$< \
2>&1 | tee -a $...@d}/import
- @echo "`now` <== $...@d}: Imported." | tee -a $...@d}/import
+ @echo "`${now}` <== $...@d}: Imported." | tee -a $...@d}/import
Install-%: %/solve
@echo "=== $@ ==="
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
