summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-03-25 00:55:32 +0100
committerGünther Deschner <gd@samba.org>2010-03-25 00:55:32 +0100
commit34674e0a61fe5b2983176e8c33aa48d43fd840ce (patch)
treec698d603ce0e4abbc27a7c7b74c748d7e00e4ce0 /source3
parentf84f65306613d2794b14b3eaeba59fe3ca5751cb (diff)
downloadsamba-34674e0a61fe5b2983176e8c33aa48d43fd840ce.tar.gz
samba-34674e0a61fe5b2983176e8c33aa48d43fd840ce.tar.bz2
samba-34674e0a61fe5b2983176e8c33aa48d43fd840ce.zip
s3-selftest: move printing config to global section.
"make test" variant. Guenther
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/script/tests/selftest.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index d06af60521..40ada286d2 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -307,6 +307,15 @@ cat >$SERVERCONFFILE<<EOF
create mask = 755
vfs objects = $BINDIR/xattr_tdb.so $BINDIR/streams_depot.so
+ printing = vlp
+ print command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb print %p %s
+ lpq command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lpq %p
+ lp rm command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lprm %p %j
+ lp pause command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lppause %p %j
+ lp resume command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lpresume %p %j
+ queue pause command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb queuepause %p
+ queue resume command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb queueresume %p
+
#Include user defined custom parameters if set
$INCLUDE_CUSTOM_CONF
@@ -327,14 +336,6 @@ cat >$SERVERCONFFILE<<EOF
[print1]
copy = tmp
printable = yes
- printing = vlp
- print command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb print %p %s
- lpq command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lpq %p
- lp rm command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lprm %p %j
- lp pause command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lppause %p %j
- lp resume command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lpresume %p %j
- queue pause command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb queuepause %p
- queue resume command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb queueresume %p
[print2]
copy = print1