selftest: Add missing printing options for plugin_s4_dc.
authorAndreas Schneider <asn@samba.org>
Thu, 30 Aug 2012 12:09:49 +0000 (14:09 +0200)
committerAndreas Schneider <asn@samba.org>
Thu, 30 Aug 2012 13:42:58 +0000 (15:42 +0200)
selftest/target/Samba4.pm

index 77e3e74921f0c7dbe6488fbba4cc3fd055d47116..21b8dcf72e8dfde05edba42952d130e561da1471 100644 (file)
@@ -722,6 +722,12 @@ sub provision($$$$$$$$$)
        push(@{$ctx->{directories}}, "$ctx->{share}");
        push(@{$ctx->{directories}}, "$ctx->{share}/test1");
        push(@{$ctx->{directories}}, "$ctx->{share}/test2");
+
+       # precreate directories for printer drivers
+       push(@{$ctx->{directories}}, "$ctx->{share}/W32X86");
+       push(@{$ctx->{directories}}, "$ctx->{share}/x64");
+       push(@{$ctx->{directories}}, "$ctx->{share}/WIN40");
+
        my $msdfs = "no";
        $msdfs = "yes" if ($server_role eq "domain controller");
        $ctx->{smb_conf_extra_options} = "
@@ -1353,6 +1359,7 @@ sub provision_plugin_s4_dc($$)
 
        my $bindir_abs = abs_path($self->{bindir});
        my $lockdir="$prefix_abs/lockdir";
+        my $conffile="$prefix_abs/etc/smb.conf";
 
        my $extra_smbconf_options = "
         server services = -smb +s3fs
@@ -1378,6 +1385,9 @@ sub provision_plugin_s4_dc($$)
 
        printcap name = /dev/null
 
+       addprinter command = $ENV{SRCDIR_ABS}/source3/script/tests/printing/modprinter.pl -a -s $conffile --
+       deleteprinter command = $ENV{SRCDIR_ABS}/source3/script/tests/printing/modprinter.pl -d -s $conffile --
+
        printing = vlp
        print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
        lpq command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb lpq %p
@@ -1407,6 +1417,20 @@ sub provision_plugin_s4_dc($$)
 [hideunread]
        copy = tmp
        hide unreadable = yes
+
+[print\$]
+       copy = tmp
+
+[print1]
+       copy = tmp
+       printable = yes
+
+[print2]
+       copy = print1
+[print3]
+       copy = print1
+[lp]
+       copy = print1
 ";
 
        print "PROVISIONING PLUGIN S4 DC...";