r26316: Use contexts for conversion functions.

[sfrench/samba-autobuild/.git] / source4 / torture / torture.h

diff --git a/source4/torture/torture.h b/source4/torture/torture.h
index 9d0f84759b193877064b5fac67eb5790e647e569..e191fb362978a988b6746a8f57e3cb088ce62ae1 100644 (file)
--- a/source4/torture/torture.h
+++ b/source4/torture/torture.h
@@ -6,7 +6,7 @@
    
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,33 +15,24 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __TORTURE_H__
 #define __TORTURE_H__
 
+#include "torture/ui.h"
+
 struct smbcli_state;
-struct torture_op {
-       const char *name;
-       BOOL (*fn)(void);
-       BOOL (*multi_fn)(struct smbcli_state *, int );
-       struct torture_op *prev, *next;
-};
 
-extern struct torture_op * torture_ops;
+extern struct torture_suite *torture_root;
 
-extern BOOL use_oplocks;
-extern BOOL torture_showall;
 extern int torture_entries;
-extern int torture_nprocs;
 extern int torture_seed;
 extern int torture_numops;
 extern int torture_failures;
-extern BOOL use_level_II_oplocks;
+extern int torture_numasync;
 
-struct torture_context;
 struct torture_test;
 
 #include "torture/proto.h"