The branch, v3-4-test has been updated
via 0146649cf95ad27a583057df300fe5712b89e806 (commit)
via f51a4b95b472496f58759dae75ff1369324c0a29 (commit)
from 3da62734fffa99cde1084beeb69e94a7bc623dde (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 0146649cf95ad27a583057df300fe5712b89e806
Author: Günther Deschner <[email protected]>
Date: Wed Apr 29 14:29:25 2009 +0200
s3-test: make it possible to find the built vlp in "make test".
Guenther
(cherry picked from commit 3316ae9d75dfe6c7a960938c9503367880510079)
commit f51a4b95b472496f58759dae75ff1369324c0a29
Author: Jelmer Vernooij <[email protected]>
Date: Wed Apr 22 23:54:10 2009 +0200
Specify explicit path to vlp, for those not having vlp in $PATH.
(cherry picked from commit 79177c1d36e125b08aa4d6e0e42e9a97f625b3c8)
-----------------------------------------------------------------------
Summary of changes:
selftest/target/Samba3.pm | 10 +++++++++-
source3/script/tests/selftest.sh | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 96b32cc..d05b5ca 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -503,7 +503,15 @@ sub provision($$$$$$)
[print1]
copy = tmp
printable = yes
- printing = test
+ printing = vlp
+ print command = $bindir_abs/vlp print %p %s
+ lpq command = $bindir_abs/vlp lpq %p
+ lp rm command = $bindir_abs/vlp lprm %p %j
+ lp pause command = $bindir_abs/vlp lppause %p %j
+ lp resume command = $bindir_abs/vlp lpresume %p %j
+ queue pause command = $bindir_abs/vlp queuepause %p
+ queue resume command = $bindir_abs/vlp queueresume %p
+
[print2]
copy = print1
[print3]
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 2fc35f1..708a45b 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -254,7 +254,15 @@ cat >$SERVERCONFFILE<<EOF
[print1]
copy = tmp
printable = yes
- printing = test
+ printing = vlp
+ print command = $BINDIR/vlp print %p %s
+ lpq command = $BINDIR/vlp lpq %p
+ lp rm command = $BINDIR/vlp lprm %p %j
+ lp pause command = $BINDIR/vlp lppause %p %j
+ lp resume command = $BINDIR/vlp lpresume %p %j
+ queue pause command = $BINDIR/vlp queuepause %p
+ queue resume command = $BINDIR/vlp queueresume %p
+
[print2]
copy = print1
[print3]
--
Samba Shared Repository
