bug-vc-dwim
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Bug-vc-dwim] [PATCH 1/2] build: tell bootstrap to check build/test requ


From: Jim Meyering
Subject: [Bug-vc-dwim] [PATCH 1/2] build: tell bootstrap to check build/test requirements
Date: Sat, 28 Apr 2012 10:31:55 +0200

I noticed 3 test failures when ctags was not installed,
and even more when tools like cvs, svn, hg, bzr were not installed.
That prompted this first change.

Also, the new author-bzr test was failing on a bare system
on which I had not yet run bzr whoami to set my name/email info.
The second patch fixes that test not to rely on such set-up.

>From 44c48552f1839dacfb7fa64385aaff6975641733 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 28 Apr 2012 10:28:16 +0200
Subject: [PATCH 1/2] build: tell bootstrap to check build/test requirements

* bootstrap.conf (buildreq): List build/test requirements.
---
 bootstrap.conf |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/bootstrap.conf b/bootstrap.conf
index 867921d..fc211cd 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -45,6 +45,23 @@ source_base=.
 gnulib_tool_option_extras='--makefile-name=gnulib.mk --local-dir=gnulib-local'
 gnulib_name=libvc_dwim

+# Build prerequisites
+buildreq="\
+autoconf   2.64
+automake   1.11.1
+git        1.4.4
+makeinfo   4.13
+cvs        -
+svn        -
+bzr        -
+hg         -
+ctags      -
+patch      -
+perl       5.5
+tar        -
+xz         -
+"
+
 # Automake requires that ChangeLog exist.
 touch ChangeLog

--
1.7.10.382.g62bc8


>From 524d1562f7cbdc9d51ec0407daef6163079b906f Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 28 Apr 2012 10:29:18 +0200
Subject: [PATCH 2/2] tests: author-bzr: don't fail when no author name/email
 is set

* tests/author-bzr: Invoke bzr whoami to set author name/email.
---
 tests/author-bzr |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/author-bzr b/tests/author-bzr
index 25933fb..57a7af4 100755
--- a/tests/author-bzr
+++ b/tests/author-bzr
@@ -9,9 +9,14 @@ require_bzr_
 cat <<EOF > ChangeLog || framework_failure_
 2006-09-04  Jim Meyering  <address@hidden>
 EOF
-bzr init > /dev/null 2>&1              \
+
+# Set HOME, so that bzr whoami doesn't affect the real $HOME.
+HOME=$(pwd); export HOME
+
+bzr whoami 'au thor <address@hidden>'  \
+  && bzr init > /dev/null              \
   && bzr add .                         \
-  && bzr commit -m m . > /dev/null 2>&1        \
+  && bzr commit -m m . > /dev/null     \
     || framework_failure_

 echo foo > x || framework_failure_
--
1.7.10.382.g62bc8



reply via email to

[Prev in Thread] Current Thread [Next in Thread]