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: 10-Mar-2012 17:43:12
Branch: rpm-5_4 Handle: 2012031016431200
Added files: (Branch: rpm-5_4)
rpm/tests/ref git.out
Modified files: (Branch: rpm-5_4)
rpm/tests Makefile.am
Log:
- tests: automate git verification.
Summary:
Revision Changes Path
1.95.2.46 +10 -7 rpm/tests/Makefile.am
1.1.2.1 +16 -0 rpm/tests/ref/git.out
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.95.2.45 -r1.95.2.46 Makefile.am
--- rpm/tests/Makefile.am 10 Mar 2012 16:15:37 -0000 1.95.2.45
+++ rpm/tests/Makefile.am 10 Mar 2012 16:43:12 -0000 1.95.2.46
@@ -967,18 +967,21 @@
gitdir = $(testdir)/tmp/git
check-git:
@echo "=== $@ ==="
- @rm -rf ${gitdir}
+ @rm -rf ${gitdir} tmp/git.out
@mkdir -p ${gitdir}
if WITH_LIBGIT2
- @echo "--> git init"
+ @${echo} -n "--> rpmgit:"
+ @${echo} -n " init"
@-${tgit} init ${gitdir}
- @-(cd ${gitdir} && ${git} status)
- @echo "--> git add"
+ @-(cd ${gitdir} && ${git} status 2>&1) >> tmp/git.out
+ @${echo} -n " add"
@-${tgit} add ${gitdir} foo
- @-(cd ${gitdir} && ${git} status)
- @echo "--> git commit"
+ @-(cd ${gitdir} && ${git} status 2>&1) >> tmp/git.out
+ @${echo} -n " commit"
@-${tgit} commit ${gitdir}
- @-(cd ${gitdir} && ${git} status)
+ @-(cd ${gitdir} && ${git} status 2>&1) >> tmp/git.out
+ @${echo} ""
+ @-diff -u tmp/git.out ref/git.out || cp tmp/git.out ref/git.out
endif
test: check-init \
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/git.out
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 git.out
--- /dev/null 2012-03-10 17:38:25.000000000 +0100
+++ git.out 2012-03-10 17:43:12.753987567 +0100
@@ -0,0 +1,16 @@
+# On branch master
+#
+# Initial commit
+#
+nothing to commit (create/copy files and use "git add" to track)
+# On branch master
+#
+# Initial commit
+#
+# Changes to be committed:
+# (use "git rm --cached <file>..." to unstage)
+#
+# new file: foo
+#
+# On branch master
+nothing to commit (working directory clean)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
