Revision: 6656
http://ipcop.svn.sourceforge.net/ipcop/?rev=6656&view=rev
Author: gespinasse
Date: 2012-06-17 10:17:23 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
Fix procps-3.3.3 test failure
- I should have tested procps only after full build, so I didn't catch 'which'
not yet build on normal build order
- ps is not yet installed, use just build ps instead
- Debian package ha2 2 files present on git tree missing, restore them
I have some issues sending mail, so proper fix are not yet send upstream.
Modified Paths:
--------------
ipcop/trunk/lfs/procps
Added Paths:
-----------
ipcop/trunk/src/patches/procps-3.3.3_missing-test-files.patch
ipcop/trunk/src/patches/procps-3.3.3_test-without-host-ps.patch
Modified: ipcop/trunk/lfs/procps
===================================================================
--- ipcop/trunk/lfs/procps 2012-06-16 12:25:26 UTC (rev 6655)
+++ ipcop/trunk/lfs/procps 2012-06-17 10:17:23 UTC (rev 6656)
@@ -90,10 +90,21 @@
#cd $(DIR_APP) && tar zxf $(DIR_DL)/$(PATCH1)
#cd $(DIR_APP) && for patch in `cat debian/patches/series` ; do patch
-p1 -i debian/patches/$$patch; done
+ # Fix the test suite
+ # This is a fast hack, unsure what should be made upstream
+ cd $(DIR_APP) && sed -i 's|exec which sleep|exec echo /bin/sleep|'
testsuite/config/unix.exp
+ # This one will be send upstream
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_test-without-host-ps.patch
+ # Debian packaging is wrong here, don't know yet why those files are
missing on debian package
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_missing-test-files.patch
+ cd $(DIR_APP) && chmod 755 testsuite/lib.test/fileutils_{badfd,full}.sh
+
cd $(DIR_APP) && ./configure --prefix= --disable-static --disable-nls
cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
- -cd $(DIR_APP); make -j 1 check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ # Using directly runtest produce just a much nicer output to read than
make check
+ # Defining DEJAGNU silent "Couldn't find the global config file" warning
+ -cd $(DIR_APP)/testsuite; make site.exp && DEJAGNU=global-conf.exp
runtest &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install-exec
Added: ipcop/trunk/src/patches/procps-3.3.3_missing-test-files.patch
===================================================================
--- ipcop/trunk/src/patches/procps-3.3.3_missing-test-files.patch
(rev 0)
+++ ipcop/trunk/src/patches/procps-3.3.3_missing-test-files.patch
2012-06-17 10:17:23 UTC (rev 6656)
@@ -0,0 +1,14 @@
+--- /dev/null 2012-06-16 11:48:42.885320141 +0200
++++ procps-ng-3.3.3/testsuite/lib.test/fileutils_badfd.sh 2012-06-16
16:02:55.000000000 +0200
+@@ -0,0 +1,4 @@
++#!/bin/sh
++
++BASEDIR=$(dirname ${0})
++${BASEDIR}/../../lib/test_fileutils >&-
+--- /dev/null 2012-06-16 11:48:42.885320141 +0200
++++ procps-ng-3.3.3/testsuite/lib.test/fileutils_full.sh 2012-06-16
16:02:52.000000000 +0200
+@@ -0,0 +1,4 @@
++#!/bin/sh
++
++BASEDIR=$(dirname ${0})
++${BASEDIR}/../../lib/test_fileutils > /dev/full
Added: ipcop/trunk/src/patches/procps-3.3.3_test-without-host-ps.patch
===================================================================
--- ipcop/trunk/src/patches/procps-3.3.3_test-without-host-ps.patch
(rev 0)
+++ ipcop/trunk/src/patches/procps-3.3.3_test-without-host-ps.patch
2012-06-17 10:17:23 UTC (rev 6656)
@@ -0,0 +1,58 @@
+From 3ae3f4ff770ab5015f1034cd5abd678c20e73712 Mon Sep 17 00:00:00 2001
+From: Gilles Espinasse <g....@free.fr>
+Date: Sat, 16 Jun 2012 14:44:31 +0200
+Subject: [PATCH] Support running pgrep and pkill tests whithout ps installed
+
+Signed-off-by: Gilles Espinasse <g....@free.fr>
+
+When ps is not installed on the host, pgrep.exp and pkill.exp fail to run ps.
+Use just build ps instead.
+---
+ testsuite/pgrep.test/pgrep.exp | 3 ++-
+ testsuite/pkill.test/pkill.exp | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/testsuite/pgrep.test/pgrep.exp b/testsuite/pgrep.test/pgrep.exp
+index 0234099..0ec52c3 100644
+--- a/testsuite/pgrep.test/pgrep.exp
++++ b/testsuite/pgrep.test/pgrep.exp
+@@ -8,6 +8,7 @@ set uid [ exec id -u ]
+ set not_uid [ expr { $uid + 1 } ]
+ set gid [ exec id -g ]
+ set not_gid [ expr { $gid + 1 } ]
++set ps "${topdir}ps/pscommand"
+ set raw_tty [ exec tty ]
+ regexp "/dev/(.+)" $raw_tty > tty
+
+@@ -15,7 +16,7 @@ make_testproc
+
+ set testproc_len [ string length $testproc_comm ]
+ set testproc_trim [ string range $testproc_comm 0 [ expr { $testproc_len - 2
} ] ]
+-set testproc1_sid [ string trim [ exec ps --no-headers -o sid $testproc1_pid
] ]
++set testproc1_sid [ string trim [ exec $ps --no-headers -o sid $testproc1_pid
] ]
+
+ set test "pgprep with no arguments"
+ spawn $pgrep
+diff --git a/testsuite/pkill.test/pkill.exp b/testsuite/pkill.test/pkill.exp
+index 83a6d75..be0e2d9 100644
+--- a/testsuite/pkill.test/pkill.exp
++++ b/testsuite/pkill.test/pkill.exp
+@@ -8,13 +8,14 @@ set uid [ exec id -u ]
+ set not_uid [ expr { $uid + 1 } ]
+ set gid [ exec id -g ]
+ set not_gid [ expr { $gid + 1 } ]
++set ps "${topdir}ps/pscommand"
+ set raw_tty [ exec tty ]
+ regexp "/dev/(.+)" $raw_tty > tty
+
+ make_testproc
+ set testproc_len [ string length $testproc_comm ]
+ set testproc_trim [ string range $testproc_comm 0 [ expr { $testproc_len - 2
} ] ]
+-set testproc1_sid [ exec ps --no-headers -o sid $testproc1_pid ]
++set testproc1_sid [ exec $ps --no-headers -o sid $testproc1_pid ]
+
+ set test "pkill with no arguments"
+ spawn $pkill
+--
+1.7.2.5
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
