diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 14:30:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 14:30:18 +0200 |
| commit | 65a449ded48ead4501bb7cb9ba7818124ad2f5e4 (patch) | |
| tree | e1651ae61b1806530db55e941c19da0987133841 /tests | |
| parent | 05cd77cd4d8f4c5a8dc0a8662c4dfe288230257d (diff) | |
| parent | 4b6e93d382a622bffedbbaa6b87f94124987e2fd (diff) | |
| download | rsyslog-65a449ded48ead4501bb7cb9ba7818124ad2f5e4.tar.gz rsyslog-65a449ded48ead4501bb7cb9ba7818124ad2f5e4.tar.xz rsyslog-65a449ded48ead4501bb7cb9ba7818124ad2f5e4.zip | |
Merge branch 'detached' into master
Conflicts:
tests/nettester.c
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/daqueue-persist.sh | 1 | ||||
| -rw-r--r-- | tests/nettester.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/daqueue-persist.sh b/tests/daqueue-persist.sh index e071e413..ff81c987 100755 --- a/tests/daqueue-persist.sh +++ b/tests/daqueue-persist.sh @@ -2,6 +2,7 @@ # to carry out multiple tests with different queue modes # added 2009-05-27 by Rgerhards # This file is part of the rsyslog project, released under GPLv3 +echo TEST: daqueue-persist.sh source $srcdir/daqueue-persist-drvr.sh LinkedList source $srcdir/daqueue-persist-drvr.sh FixedArray # the disk test should not fail, however, the config is extreme and using diff --git a/tests/nettester.c b/tests/nettester.c index 209c2a6f..71641745 100644 --- a/tests/nettester.c +++ b/tests/nettester.c @@ -147,7 +147,7 @@ tcpSend(char *buf, int lenBuf) fprintf(stderr, "connect() failed\n"); return(1); } else { - usleep(100000); /* 0.1 sec, these are us! */ + usleep(100000); /* ms = 1000 us! */ } } } |