diff options
| author | Christoph Biedl <ngircd.anoy@manchmal.in-ulm.de> | 2012-03-03 18:53:03 +0100 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2012-03-03 18:53:03 +0100 |
| commit | 257fe922d2c2ee822c372bc5b979075271915553 (patch) | |
| tree | 4f400428c3a41990d24684b376383451a435d37a /src | |
| parent | 1068f883779ad9b8bf3e1e1b8234781e4223761d (diff) | |
| download | ngircd-257fe922d2c2ee822c372bc5b979075271915553.tar.gz ngircd-257fe922d2c2ee822c372bc5b979075271915553.zip | |
getpid.sh: Fix testcase error for Debian using sbuild
When
* building the ngircd Debian package (on Linux at least) and
* using the sbuild build system,
the command "ps -af" does not include the commands running inside the
sbuild system. Therefore, start-server.sh will report a fail as getpid.sh
cannot not find the ./T-ngircd1 just started although it's actually
running. This results in a funny build log ...
starting server 1 ... failure!
FAIL: start-server1
running connect-test ... ok.
PASS: connect-test
The self-test of getpid.sh however will likely succeed as it's happy if
it sees any process with "sh" somewhere in the name. Things go downhill
from there.
The confusing things are:
* The alternative cowbuilder/pbuilder does not have this problem.
* The alternative usage "ps ax" does fine.
So, as a quick hack, the patch attached adds another switch to getpid.sh.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/testsuite/getpid.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/testsuite/getpid.sh b/src/testsuite/getpid.sh index fd3b3422..19ced762 100755 --- a/src/testsuite/getpid.sh +++ b/src/testsuite/getpid.sh @@ -13,6 +13,8 @@ elif [ $UNAME = "A/UX" ]; then PS_FLAGS="-ae"; PS_PIDCOL="1"; HEAD_FLAGS="-1" elif [ $UNAME = "GNU" ]; then PS_FLAGS="-ax"; PS_PIDCOL="2"; HEAD_FLAGS="-n 1" +elif [ $UNAME = "Linux" ]; then + PS_FLAGS="ax"; PS_PIDCOL="1"; HEAD_FLAGS="-n 1" elif [ $UNAME = "SunOS" ]; then PS_FLAGS="-af"; PS_PIDCOL=2; HEAD_FLAGS="-n 1" else |