aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2013-02-27 22:49:07 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2013-02-27 22:49:07 +0000
commit01797eb3c890bbadb029fdea1bf998042bf7b1cd (patch)
treed45214309d4b043b2ec832ff860434f1ead21205
parent0a6ae520696f04bccdcee386565b44f72262f484 (diff)
Fix a potential test error in procps-ng
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10175 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter06/procps.xml10
-rw-r--r--general.ent4
3 files changed, 19 insertions, 6 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 635d5d93d..7099a3404 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
-->
<listitem>
+ <para>2013-02-27</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Fix a potential test error in procps-ng.
+ Thanks to Pierre Labastie for the patch. Fixes
+ <ulink url="&lfs-ticket-root;3293">#3293</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2013-02-26</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 1b59d83af..f9370229a 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -74,13 +74,15 @@
<screen><userinput remap="make">make</userinput></screen>
<para>The test suite needs some custom modifications for LFS.
- The <command>which</command> is not available and the
+ The <command>which</command> command is not available, the
<command>pmap</command> test does not match a newline character in
- two tests. To run the test suite, run the following commands:</para>
+ two tests, and the <command>slabtop</command> test may return more than
+ 999,999 objects. To run the test suite, run the following commands:</para>
<screen><userinput remap="test">pushd testsuite
- sed -i 's|exec which sleep|exec echo /tools/bin/sleep|' config/unix.exp
- sed -i 's|pmap_initname\\\$|pmap_initname|' pmap.test/pmap.exp
+ sed -i -e 's|exec which sleep|exec echo /tools/bin/sleep|' \
+ -e 's|999999|&amp;9|' config/unix.exp
+ sed -i 's|pmap_initname\\\$|pmap_initname|' pmap.test/pmap.exp
make site.exp
DEJAGNU=global-conf.exp runtest
popd</userinput></screen>
diff --git a/general.ent b/general.ent
index db46d5a5a..3eebab5b5 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-2013026">
-<!ENTITY releasedate "February 26, 2013">
+<!ENTITY version "SVN-2013027">
+<!ENTITY releasedate "February 27, 2013">
<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.3">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->