summaryrefslogtreecommitdiff
path: root/source4/torture/torture.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-24 22:26:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:06:07 -0500
commit9e5bee246f4317898f302faa755d074a932c84bf (patch)
tree042dd8a8fae48206f405ab57281fcc7728a423a0 /source4/torture/torture.c
parent8ac9d36f93e21c74762af5b0a362f73ee74462ae (diff)
downloadsamba-9e5bee246f4317898f302faa755d074a932c84bf.tar.gz
samba-9e5bee246f4317898f302faa755d074a932c84bf.tar.bz2
samba-9e5bee246f4317898f302faa755d074a932c84bf.zip
r3945: expanded the BASE-PROPERTIES test to print a nicely formatted list of
the capabilities and filesystem attribute bits of the server. (This used to be commit 9debe2938194d686eb9ef46f7e10010490f2a624)
Diffstat (limited to 'source4/torture/torture.c')
-rw-r--r--source4/torture/torture.c31
1 files changed, 3 insertions, 28 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index b0a4f6ab8a..7e1cd1f138 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -1309,32 +1309,6 @@ static BOOL run_trans2test(void)
}
-/*
- print out server properties
- */
-static BOOL run_properties(void)
-{
- struct smbcli_state *cli;
- BOOL correct = True;
-
- printf("starting properties test\n");
-
- ZERO_STRUCT(cli);
-
- if (!torture_open_connection(&cli)) {
- return False;
- }
-
- d_printf("Capabilities 0x%08x\n", cli->transport->negotiate.capabilities);
-
- if (!torture_close_connection(cli)) {
- correct = False;
- }
-
- return correct;
-}
-
-
/* FIRST_DESIRED_ACCESS 0xf019f */
#define FIRST_DESIRED_ACCESS SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|SA_RIGHT_FILE_APPEND_DATA|\
@@ -2333,10 +2307,11 @@ double torture_create_procs(BOOL (*fn)(struct smbcli_state *, int), BOOL *result
for (i=0;i<torture_nprocs;i++) {
child_status[i] = 0;
}
- kill(0, SIGCONT);
printf("%d clients started\n", torture_nprocs);
+ kill(0, SIGCONT);
+
for (i=0;i<torture_nprocs;i++) {
int ret;
while ((ret=sys_waitpid(0, &status, 0)) == -1 && errno == EINTR) /* noop */ ;
@@ -2393,7 +2368,7 @@ static struct {
{"BASE-XCOPY", run_xcopy, 0},
{"BASE-RENAME", torture_test_rename, 0},
{"BASE-DELETE", torture_test_delete, 0},
- {"BASE-PROPERTIES", run_properties, 0},
+ {"BASE-PROPERTIES", torture_test_properties, 0},
{"BASE-MANGLE", torture_mangle, 0},
{"BASE-OPENATTR", torture_openattrtest, 0},
{"BASE-CHARSET", torture_charset, 0},