svn commit: samba r25004 - in branches/SAMBA_4_0: .
source/torture/nbt
jelmer at samba.org
jelmer at samba.org
Fri Sep 7 16:28:01 GMT 2007
Author: jelmer
Date: 2007-09-07 16:27:57 +0000 (Fri, 07 Sep 2007)
New Revision: 25004
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25004
Log:
Avoid talloc_autofree_context() when possible.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/torture/nbt/dgram.c
branches/SAMBA_4_0/source/torture/nbt/nbt.c
branches/SAMBA_4_0/source/torture/nbt/query.c
branches/SAMBA_4_0/source/torture/nbt/register.c
branches/SAMBA_4_0/source/torture/nbt/wins.c
branches/SAMBA_4_0/source/torture/nbt/winsbench.c
branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/torture/nbt/dgram.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/dgram.c 2007-09-07 16:27:02 UTC (rev 25003)
+++ branches/SAMBA_4_0/source/torture/nbt/dgram.c 2007-09-07 16:27:57 UTC (rev 25004)
@@ -340,9 +340,9 @@
/*
test nbt dgram operations
*/
-struct torture_suite *torture_nbt_dgram(void)
+struct torture_suite *torture_nbt_dgram(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "DGRAM");
+ struct torture_suite *suite = torture_suite_create(suite, "DGRAM");
torture_suite_add_simple_test(suite, "netlogon", nbt_test_netlogon);
torture_suite_add_simple_test(suite, "netlogon2", nbt_test_netlogon2);
Modified: branches/SAMBA_4_0/source/torture/nbt/nbt.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/nbt.c 2007-09-07 16:27:02 UTC (rev 25003)
+++ branches/SAMBA_4_0/source/torture/nbt/nbt.c 2007-09-07 16:27:57 UTC (rev 25004)
@@ -29,7 +29,7 @@
const char **address)
{
make_nbt_name_server(name, strupper_talloc(tctx,
- torture_setting_string(tctx, "host", NULL)));
+ torture_setting_string(tctx, "host", NULL)));
/* do an initial name resolution to find its IP */
torture_assert_ntstatus_ok(tctx,
@@ -43,18 +43,17 @@
NTSTATUS torture_nbt_init(void)
{
struct torture_suite *suite = torture_suite_create(
- talloc_autofree_context(),
- "NBT");
+ talloc_autofree_context(), "NBT");
/* nbt tests */
- torture_suite_add_suite(suite, torture_nbt_register());
- torture_suite_add_suite(suite, torture_nbt_wins());
- torture_suite_add_suite(suite, torture_nbt_dgram());
- torture_suite_add_suite(suite, torture_nbt_winsreplication());
- torture_suite_add_suite(suite, torture_bench_nbt());
- torture_suite_add_suite(suite, torture_bench_wins());
+ torture_suite_add_suite(suite, torture_nbt_register(suite));
+ torture_suite_add_suite(suite, torture_nbt_wins(suite));
+ torture_suite_add_suite(suite, torture_nbt_dgram(suite));
+ torture_suite_add_suite(suite, torture_nbt_winsreplication(suite));
+ torture_suite_add_suite(suite, torture_bench_nbt(suite));
+ torture_suite_add_suite(suite, torture_bench_wins(suite));
suite->description = talloc_strdup(suite,
- "NetBIOS over TCP/IP and WINS tests");
+ "NetBIOS over TCP/IP and WINS tests");
torture_register_suite(suite);
Modified: branches/SAMBA_4_0/source/torture/nbt/query.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/query.c 2007-09-07 16:27:02 UTC (rev 25003)
+++ branches/SAMBA_4_0/source/torture/nbt/query.c 2007-09-07 16:27:57 UTC (rev 25004)
@@ -104,10 +104,9 @@
/*
benchmark how fast a server can respond to name queries
*/
-struct torture_suite *torture_bench_nbt(void)
+struct torture_suite *torture_bench_nbt(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(talloc_autofree_context(),
- "BENCH");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "BENCH");
torture_suite_add_simple_test(suite, "namequery", bench_namequery);
return suite;
Modified: branches/SAMBA_4_0/source/torture/nbt/register.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/register.c 2007-09-07 16:27:02 UTC (rev 25003)
+++ branches/SAMBA_4_0/source/torture/nbt/register.c 2007-09-07 16:27:57 UTC (rev 25004)
@@ -155,11 +155,11 @@
/*
test name registration to a server
*/
-struct torture_suite *torture_nbt_register(void)
+struct torture_suite *torture_nbt_register(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite;
- suite = torture_suite_create(talloc_autofree_context(), "REGISTER");
+ suite = torture_suite_create(mem_ctx, "REGISTER");
torture_suite_add_simple_test(suite, "register_own", nbt_register_own);
torture_suite_add_simple_test(suite, "refresh_own", nbt_refresh_own);
Modified: branches/SAMBA_4_0/source/torture/nbt/wins.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/wins.c 2007-09-07 16:27:02 UTC (rev 25003)
+++ branches/SAMBA_4_0/source/torture/nbt/wins.c 2007-09-07 16:27:57 UTC (rev 25004)
@@ -284,10 +284,9 @@
/*
test WINS operations
*/
-struct torture_suite *torture_nbt_wins(void)
+struct torture_suite *torture_nbt_wins(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(talloc_autofree_context(),
- "WINS");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, "WINS");
torture_suite_add_simple_test(suite, "wins", nbt_test_wins);
Modified: branches/SAMBA_4_0/source/torture/nbt/winsbench.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/winsbench.c 2007-09-07 16:27:02 UTC (rev 25003)
+++ branches/SAMBA_4_0/source/torture/nbt/winsbench.c 2007-09-07 16:27:57 UTC (rev 25004)
@@ -282,11 +282,10 @@
benchmark how fast a WINS server can respond to a mixture of
registration/refresh/release and name query requests
*/
-struct torture_suite *torture_bench_wins(void)
+struct torture_suite *torture_bench_wins(TALLOC_CTX *mem_ctx)
{
- struct torture_suite *suite = torture_suite_create(
- talloc_autofree_context(),
- "BENCH-WINS");
+ struct torture_suite *suite = torture_suite_create(mem_ctx,
+ "BENCH-WINS");
torture_suite_add_simple_test(suite, "wins", bench_wins);
Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2007-09-07 16:27:02 UTC (rev 25003)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2007-09-07 16:27:57 UTC (rev 25004)
@@ -9669,11 +9669,10 @@
/*
test simple WINS replication operations
*/
-struct torture_suite *torture_nbt_winsreplication(void)
+struct torture_suite *torture_nbt_winsreplication(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(
- talloc_autofree_context(),
- "WINSREPLICATION");
+ mem_ctx, "WINSREPLICATION");
struct torture_tcase *tcase;
tcase = torture_suite_add_simple_test(suite, "assoc_ctx1",
More information about the samba-cvs
mailing list