summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-10-10 05:40:32 +0000
committerAndrew Tridgell <tridge@samba.org>2003-10-10 05:40:32 +0000
commit4e73a3c0feb47c761fdcded9e6c2ac6d32534d9b (patch)
tree567ab5fc754a3df597d07e2e5870fa0a35e2bf77 /source4/torture
parentb382acea72c8cc8325142b4dc8e182c75f5e476b (diff)
downloadsamba-4e73a3c0feb47c761fdcded9e6c2ac6d32534d9b.tar.gz
samba-4e73a3c0feb47c761fdcded9e6c2ac6d32534d9b.tar.bz2
samba-4e73a3c0feb47c761fdcded9e6c2ac6d32534d9b.zip
fixed snprintf.c for systems that have only some of the *printf() family of functions
cope with servers that return bogus (too large) values in max_xmit cope with a couple more error conditions in RAW-SFILEINFO better startup time heuristics in NBENCH (This used to be commit 89f7261ba589e5760b3cf9c3594eab9d7198dd7e)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/raw/setfileinfo.c6
-rw-r--r--source4/torture/torture.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 0871d25bc5..9da75596c5 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -143,7 +143,7 @@ BOOL torture_raw_sfileinfo(int dummy)
#define CHECK_VALUE(call, stype, field, value) do { \
CHECK1(call); \
- if (NT_STATUS_IS_OK(status) && finfo2.stype.out.field != value) { \
+ if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(status2) && finfo2.stype.out.field != value) { \
printf("(%d) %s - %s/%s should be 0x%x - 0x%x\n", __LINE__, \
call_name, #stype, #field, \
(uint_t)value, (uint_t)finfo2.stype.out.field); \
@@ -152,7 +152,7 @@ BOOL torture_raw_sfileinfo(int dummy)
#define CHECK_TIME(call, stype, field, value) do { \
CHECK1(call); \
- if (NT_STATUS_IS_OK(status) && nt_time_to_unix(&finfo2.stype.out.field) != value) { \
+ if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(status2) && nt_time_to_unix(&finfo2.stype.out.field) != value) { \
printf("(%d) %s - %s/%s should be 0x%x - 0x%x\n", __LINE__, \
call_name, #stype, #field, \
(uint_t)value, \
@@ -164,7 +164,7 @@ BOOL torture_raw_sfileinfo(int dummy)
#define CHECK_STR(call, stype, field, value) do { \
CHECK1(call); \
- if (NT_STATUS_IS_OK(status) && strcmp(finfo2.stype.out.field, value) != 0) { \
+ if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(status2) && strcmp(finfo2.stype.out.field, value) != 0) { \
printf("(%d) %s - %s/%s should be '%s' - '%s'\n", __LINE__, \
call_name, #stype, #field, \
value, \
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index f54483ae45..fe1bddcc2a 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -3763,7 +3763,7 @@ static double create_procs(BOOL (*fn)(int), BOOL *result)
volatile BOOL *child_status_out;
int synccount;
int tries = 8;
- double start_time_limit = 10 + (nprocs * 0.5);
+ double start_time_limit = 10 + (nprocs * 1.5);
synccount = 0;
@@ -3808,7 +3808,7 @@ static double create_procs(BOOL (*fn)(int), BOOL *result)
child_status[i] = getpid();
- while (child_status[i] && end_timer() < start_time_limit) msleep(2);
+ while (child_status[i] && end_timer() < start_time_limit) msleep(100);
if (child_status[i]) {
printf("Child %d failed to start!\n", i);