sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

smbtorture: Fix loading of --load-list.

Browse Source
This commit is contained in:
Jelmer Vernooij 2010-06-25 02:40:37 +02:00
parent 653b30f91f
commit 0802f354ea
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/selftest/tests.sh
View File

@ -517,3 +517,4 @@ plantestsuite "blackbox.upgradeprovision.py" none PYTHON="$PYTHON" $samba4srcdir
plantestsuite "blackbox.setpassword.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_setpassword.sh "$PREFIX/provision"
plantestsuite "blackbox.newuser.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_newuser.sh "$PREFIX/provision"
plantestsuite "blackbox.group.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_group.sh "$PREFIX/provision"
plantestsuite_loadlist "blaat" none PYTHON="$PYTHON" "$samba4srcdir/record.py"

22
source4/torture/smbtorture.c
View File

@ -410,9 +410,10 @@ int main(int argc,char *argv[])
int num_extra_users = 0;
char **restricted = NULL;
int num_restricted = -1;
const char *load_list = NULL;
enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS, OPT_LIST,
OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC,OPT_NUMPROGS,
OPT_EXTRA_USER,OPT_LOAD_LIST,};
OPT_EXTRA_USER,};
struct poptOption long_options[] = {
POPT_AUTOHELP
@ -442,7 +443,7 @@ int main(int argc,char *argv[])
"set maximum time for smbtorture to live", "seconds"},
{"extra-user", 0, POPT_ARG_STRING, NULL, OPT_EXTRA_USER,
"extra user credentials", NULL},
{"load-list", 0, POPT_ARG_STRING, NULL, OPT_LOAD_LIST,
{"load-list", 0, POPT_ARG_STRING, &load_list, 0,
"load a test id list from a text file", NULL},
POPT_COMMON_SAMBA
POPT_COMMON_CONNECTION
@ -496,14 +497,6 @@ int main(int argc,char *argv[])
talloc_free(option);
}
break;
case OPT_LOAD_LIST:
restricted = file_lines_load(optarg, &num_restricted, 0,
talloc_autofree_context());
if (restricted == NULL) {
printf("Unable to read load list file '%s'\n", optarg);
exit(1);
}
break;
default:
if (opt < 0) {
printf("bad command line option %d\n", opt);
@ -512,6 +505,15 @@ int main(int argc,char *argv[])
}
}
if (load_list != NULL) {
restricted = file_lines_load(load_list, &num_restricted, 0,
talloc_autofree_context());
if (restricted == NULL) {
printf("Unable to read load list file '%s'\n", load_list);
exit(1);
}
}
if (strcmp(target, "samba3") == 0) {
lp_set_cmdline(cmdline_lp_ctx, "torture:samba3", "true");
lp_set_cmdline(cmdline_lp_ctx, "torture:resume_key_support", "false");