aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/binutils.xml2
-rw-r--r--chapter06/diffutils.xml6
-rw-r--r--chapter06/vim.xml9
3 files changed, 12 insertions, 5 deletions
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 36d303b49..f4f41f314 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -143,6 +143,8 @@ cd build</userinput></screen>
<screen><userinput remap="test">make -k check</userinput></screen>
+ <para>One test, debug_msg.sh, is known ot fail.</para>
+
<para>Install the package:</para>
<screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index d98bc500d..ecd7dea51 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -41,9 +41,11 @@
<sect2 role="installation">
<title>Installation of Diffutils</title>
- <para>First fix a file so locale files are installed:</para>
+ <para>First fix a file so locale files are installed and fix the
+ included gnulib code:</para>
-<screen><userinput remap="pre">sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
+<screen><userinput remap="pre">sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in
+sed -i '233,237 s/max)/max) \\/' lib/intprops.h</userinput></screen>
<para>Prepare Diffutils for compilation:</para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 94672585a..c19db6334 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -48,6 +48,10 @@
<screen><userinput remap="pre">echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
+ <para>Disable a test that fails:</para>
+
+<screen><userinput remap="pre">sed -i '/call/{s/split/xsplit/;s/303/492/}' src/testdir/test_recover.vim</userinput></screen>
+
<para>Prepare Vim for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
@@ -58,13 +62,12 @@
<para>To test the results, issue:</para>
-<screen><userinput remap="test">make -j1 test</userinput></screen>
+<screen><userinput remap="test">make -j1 test &amp;&gt; vim-test.log</userinput></screen>
<para>However, this test suite outputs a lot of binary data to the screen,
which can cause issues with the settings of the current terminal. This can
be resolved by redirecting the output to a log file. A successful test
- will result in the words "ALL DONE" at completion. One test,
- Test_recover_root_dir() is known to fail, but is harmless.</para>
+ will result in the words "ALL DONE" at completion.</para>
<para>Install the package:</para>