Author: vlendec Date: 2006-08-20 17:29:00 +0000 (Sun, 20 Aug 2006) New Revision: 17622
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17622 Log: Add a framework for a printing backend designed to support the build farm. If we want to walk more printing code in the build farm I think doing that with a customized printing backend is much easier than with a set of shell scripts. Jerry, comments? Volker Added: branches/SAMBA_3_0/source/printing/print_test.c Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/include/printing.h branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh branches/SAMBA_3_0/source/script/tests/tests_all.sh Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in =================================================================== --- branches/SAMBA_3_0/source/Makefile.in 2006-08-20 17:19:55 UTC (rev 17621) +++ branches/SAMBA_3_0/source/Makefile.in 2006-08-20 17:29:00 UTC (rev 17622) @@ -450,7 +450,7 @@ PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \ printing/print_cups.o printing/print_generic.o \ printing/lpq_parse.o printing/load.o \ - printing/print_iprint.o + printing/print_iprint.o printing/print_test.o PRINTBASE_OBJ = printing/notify.o printing/printing_db.o PRINTBACKEND_OBJ = printing/printing.o printing/nt_printing.o $(PRINTBASE_OBJ) Modified: branches/SAMBA_3_0/source/include/printing.h =================================================================== --- branches/SAMBA_3_0/source/include/printing.h 2006-08-20 17:19:55 UTC (rev 17621) +++ branches/SAMBA_3_0/source/include/printing.h 2006-08-20 17:29:00 UTC (rev 17622) @@ -73,6 +73,10 @@ extern struct printif iprint_printif; #endif /* HAVE_IPRINT */ +#if defined(DEVELOPER) || defined(ENABLE_BUILD_FARM_HACKS) +extern struct printif test_printif; +#endif /* DEVELOPER||ENABLE_BUILD_FARM_HACKS */ + /* PRINT_MAX_JOBID is now defined in local.h */ #define UNIX_JOB_START PRINT_MAX_JOBID #define NEXT_JOBID(j) ((j+1) % PRINT_MAX_JOBID > 0 ? (j+1) % PRINT_MAX_JOBID : 1) Added: branches/SAMBA_3_0/source/printing/print_test.c =================================================================== --- branches/SAMBA_3_0/source/printing/print_test.c 2006-08-20 17:19:55 UTC (rev 17621) +++ branches/SAMBA_3_0/source/printing/print_test.c 2006-08-20 17:29:00 UTC (rev 17622) @@ -0,0 +1,81 @@ +/* + * Printing backend for the build farm + * + * Copyright (C) Volker Lendecke 2006 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "includes.h" +#include "printing.h" + +#if defined(DEVELOPER) || defined(ENABLE_BUILD_FARM_HACKS) + +static int test_queue_get(const char *printer_name, + enum printing_types printing_type, + char *lpq_command, + print_queue_struct **q, + print_status_struct *status) +{ + return -1; +} + +static int test_queue_pause(int snum) +{ + return -1; +} + +static int test_queue_resume(int snum) +{ + return -1; +} + +static int test_job_delete(const char *sharename, const char *lprm_command, + struct printjob *pjob) +{ + return -1; +} + +static int test_job_pause(int snum, struct printjob *pjob) +{ + return -1; +} + +static int test_job_resume(int snum, struct printjob *pjob) +{ + return -1; +} + +static int test_job_submit(int snum, struct printjob *pjob) +{ + return -1; +}; + +struct printif test_printif = +{ + PRINT_TEST, + test_queue_get, + test_queue_pause, + test_queue_resume, + test_job_delete, + test_job_pause, + test_job_resume, + test_job_submit, +}; + +#else + /* this keeps fussy compilers happy */ + void print_test_dummy(void) {} +#endif /* DEVELOPER||ENABLE_BUILD_FARM_HACKS */ Modified: branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh =================================================================== --- branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh 2006-08-20 17:19:55 UTC (rev 17621) +++ branches/SAMBA_3_0/source/script/tests/test_posix_s3.sh 2006-08-20 17:29:00 UTC (rev 17622) @@ -37,6 +37,7 @@ rpc="$rpc RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-SHARESEC" tests="$base $raw $rpc" +tests=RPC-SAMBA3-SPOOLSS skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV" skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS" Modified: branches/SAMBA_3_0/source/script/tests/tests_all.sh =================================================================== --- branches/SAMBA_3_0/source/script/tests/tests_all.sh 2006-08-20 17:19:55 UTC (rev 17621) +++ branches/SAMBA_3_0/source/script/tests/tests_all.sh 2006-08-20 17:29:00 UTC (rev 17622) @@ -1,6 +1,6 @@ -$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?` -$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?` +#$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?` +#$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?` SMBTORTURE4VERSION=`$SMBTORTURE4 --version` if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
