svn commit: samba r24927 - in branches/4.0-spoolsstest: .
source/selftest source/torture/rpc
jelmer at samba.org
jelmer at samba.org
Mon Sep 3 12:45:54 GMT 2007
Author: jelmer
Date: 2007-09-03 12:45:53 +0000 (Mon, 03 Sep 2007)
New Revision: 24927
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24927
Log:
Fix the build.
Modified:
branches/4.0-spoolsstest/
branches/4.0-spoolsstest/source/selftest/test_rpc.sh
branches/4.0-spoolsstest/source/torture/rpc/spoolss.c
branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
Changeset:
Property changes on: branches/4.0-spoolsstest
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-spoolsstest/source/selftest/test_rpc.sh
===================================================================
--- branches/4.0-spoolsstest/source/selftest/test_rpc.sh 2007-09-03 12:45:46 UTC (rev 24926)
+++ branches/4.0-spoolsstest/source/selftest/test_rpc.sh 2007-09-03 12:45:53 UTC (rev 24927)
@@ -38,7 +38,7 @@
done
for bindoptions in "" $VALIDATE bigendian; do
- for t in $tests; do
+ for t in $auto_rpc_tests; do
plantest "$t with $bindoptions" dc $VALGRIND $samba4bindir/smbtorture $TORTURE_OPTIONS "\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*"
done
done
Modified: branches/4.0-spoolsstest/source/torture/rpc/spoolss.c
===================================================================
--- branches/4.0-spoolsstest/source/torture/rpc/spoolss.c 2007-09-03 12:45:46 UTC (rev 24926)
+++ branches/4.0-spoolsstest/source/torture/rpc/spoolss.c 2007-09-03 12:45:53 UTC (rev 24927)
@@ -2076,12 +2076,11 @@
return ret;
}
-<<<<<<< TREE
/** Test that makes sure that calling ReplyOpenPrinter()
* on Samba 4 will cause an irpc broadcast call.
*/
static bool test_ReplyOpenPrinter(struct torture_context *tctx,
- struct dcerpc_pipe *pipe)
+ struct dcerpc_pipe *pipe)
{
struct spoolss_ReplyOpenPrinter r;
struct spoolss_ReplyClosePrinter s;
Modified: branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c
===================================================================
--- branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c 2007-09-03 12:45:46 UTC (rev 24926)
+++ branches/4.0-spoolsstest/source/torture/rpc/spoolss_notify.c 2007-09-03 12:45:53 UTC (rev 24927)
@@ -60,7 +60,7 @@
talloc_autofree_context(), "SPOOLSS-NOTIFY");
struct torture_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite,
- "notify", &dcerpc_table_spoolss);
+ "notify", &ndr_table_spoolss);
torture_rpc_tcase_add_test(tcase, "test_replyopenprinter",
test_ReplyOpenPrinter);
More information about the samba-cvs
mailing list