From 01797eb3c890bbadb029fdea1bf998042bf7b1cd Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 27 Feb 2013 22:49:07 +0000 Subject: [PATCH] Fix a potential test error in procps-ng git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10175 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 11 +++++++++++ chapter06/procps.xml | 10 ++++++---- general.ent | 4 ++-- 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 @@ -36,6 +36,17 @@ --> + + 2013-02-27 + + + [bdubbs] - Fix a potential test error in procps-ng. + Thanks to Pierre Labastie for the patch. Fixes + #3293. + + + + 2013-02-26 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 @@ make The test suite needs some custom modifications for LFS. - The which is not available and the + The which command is not available, the pmap test does not match a newline character in - two tests. To run the test suite, run the following commands: + two tests, and the slabtop test may return more than + 999,999 objects. To run the test suite, run the following commands: 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|&9|' config/unix.exp + sed -i 's|pmap_initname\\\$|pmap_initname|' pmap.test/pmap.exp make site.exp DEJAGNU=global-conf.exp runtest popd diff --git a/general.ent b/general.ent index db46d5a5a..3eebab5b5 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + +