Move torture directory to top-level.

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index e465529f6b0c3ecc8d63405d357c9b7362ca5ad1..6b2a5b1061cc1e672c8e5197f12950112967b910 100644 (file)
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -2,7 +2,7 @@
    Unix SMB/CIFS implementation.
    SMB torture UI functions
 
-   Copyright (C) Jelmer Vernooij 2006
+   Copyright (C) Jelmer Vernooij 2006-2008
    
    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
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
+#include "../torture/torture.h"
 #include "../lib/util/dlinklist.h"
 #include "param/param.h"
 #include "system/filesys.h"

diff --git a/lib/torture/torture.h b/lib/torture/torture.h
index f06ffe012b430291f5f975ef15d7de4142bfdf39..f16d2707bb373014f9f5878ca21b20bfc90ffbd5 100644 (file)
--- a/lib/torture/torture.h
+++ b/lib/torture/torture.h
@@ -105,8 +105,6 @@ struct torture_results
        bool quiet;
 
        bool returncode;
-
-
 };
 
 /* 

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 1743431aa4456d86d616468388699196e0e787b1..032a3d9c35ace9059b084336355c1bc64eda868a 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -88,7 +88,7 @@ libutilsrcdir := $(samba4srcdir)/../lib/util
 libtdrsrcdir := $(samba4srcdir)/lib/tdr
 libdbwrapsrcdir := $(samba4srcdir)/lib/dbwrap
 libcryptosrcdir := $(samba4srcdir)/../lib/crypto
-libtorturesrcdir := $(samba4srcdir)/lib/torture
+libtorturesrcdir := ../lib/torture
 libcompressionsrcdir := $(samba4srcdir)/../lib/compression
 libgencachesrcdir := $(samba4srcdir)/lib
 paramsrcdir := $(samba4srcdir)/param

diff --git a/source4/Makefile b/source4/Makefile
index be41d02a3847f3dfa2a377b3bd9d3b0057f1b73d..38eb0706c9e540d9a6d63047ab18509b749d61f9 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -11,7 +11,7 @@ include mkconfig.mk
 pidldir := $(srcdir)/../pidl
 
 basedir = $(prefix)
-torturedir = $(libdir)/torture
+torturedir = ../lib/torture
 swatdir = $(datadir)/swat
 setupdir = $(datadir)/setup
 ncalrpcdir = $(localstatedir)/ncalrpc
@@ -78,7 +78,7 @@ libutilsrcdir := ../lib/util
 libtdrsrcdir := lib/tdr
 libdbwrapsrcdir := lib/dbwrap
 libcryptosrcdir := ../lib/crypto
-libtorturesrcdir := lib/torture
+libtorturesrcdir := ../lib/torture
 smb_serversrcdir := smb_server
 libcompressionsrcdir := ../lib/compression
 libgencachesrcdir := lib

diff --git a/source4/configure.ac b/source4/configure.ac
index cf85b13225dc795f80ebaf8e5ee99f0b5ca56816..a90ac9e66801fa2b83c47e109cfd4d429d7a5452 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -37,7 +37,7 @@ AC_CONFIG_FILES(lib/registry/registry.pc)
 AC_CONFIG_FILES(lib/events/events.pc)
 AC_CONFIG_FILES(librpc/dcerpc.pc)
 AC_CONFIG_FILES(../librpc/ndr.pc)
-AC_CONFIG_FILES(lib/torture/torture.pc)
+AC_CONFIG_FILES(../lib/torture/torture.pc)
 AC_CONFIG_FILES(auth/gensec/gensec.pc)
 AC_CONFIG_FILES(param/samba-hostconfig.pc)
 AC_CONFIG_FILES(librpc/dcerpc_samr.pc)

diff --git a/source4/main.mk b/source4/main.mk
index 278c38454d57b6e0da2a50a2672a77bc6d09db3f..0a72487f8afd9123be04d9278349a1292c3fd0dd 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -23,7 +23,7 @@ mkinclude ../lib/util/config.mk
 mkinclude lib/tdr/config.mk
 mkinclude lib/dbwrap/config.mk
 mkinclude ../lib/crypto/config.mk
-mkinclude lib/torture/config.mk
+mkinclude ../lib/torture/config.mk
 mkinclude lib/basic.mk
 mkinclude lib/com/config.mk
 # WMI fails at the moment

diff --git a/source4/torture/rpc/ntsvcs.c b/source4/torture/rpc/ntsvcs.c
index 10c1ce21f344fa08b7311f69ef9ee3ee72c99481..3db79ac8bf4185a3a7fdb7cddb73a40c1d51a346 100644 (file)
--- a/source4/torture/rpc/ntsvcs.c
+++ b/source4/torture/rpc/ntsvcs.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
+#include "lib/torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "librpc/gen_ndr/ndr_ntsvcs_c.h"
 #include "torture/util.h"

diff --git a/source4/torture/rpc/rpc.h b/source4/torture/rpc/rpc.h
index 29b1ebee542281274a3c1a4e8fa7a65290e21593..9fd64f18b5f17dd32fff274953e85b4561fd18ef 100644 (file)
--- a/source4/torture/rpc/rpc.h
+++ b/source4/torture/rpc/rpc.h
@@ -21,14 +21,13 @@
 #ifndef __TORTURE_RPC_H__
 #define __TORTURE_RPC_H__
 
-#include "torture/torture.h"
+#include "lib/torture/torture.h"
 #include "auth/credentials/credentials.h"
 #include "torture/rpc/drsuapi.h"
 #include "libnet/libnet_join.h"
 #include "librpc/rpc/dcerpc.h"
 #include "libcli/raw/libcliraw.h"
 #include "torture/rpc/proto.h"
-#include "torture/torture.h"
 
 struct torture_rpc_tcase {
        struct torture_tcase tcase;

diff --git a/source4/torture/smbtorture.h b/source4/torture/smbtorture.h
index 3b5a573d83f0d9e36675c8ebc847d28a8ff65847..28e82f3abd634fe48a66ab01e46e87538f817fa3 100644 (file)
--- a/source4/torture/smbtorture.h
+++ b/source4/torture/smbtorture.h
@@ -21,7 +21,7 @@
 #ifndef __SMBTORTURE_H__
 #define __SMBTORTURE_H__
 
-#include "torture/torture.h"
+#include "lib/torture/torture.h"
 
 struct smbcli_state;
 

diff --git a/source4/torture/util.h b/source4/torture/util.h
index f36d54233dcc673146f257c8067530b9fc65d8a7..3609cca7d98e85671bf7e798a844ce278c601e22 100644 (file)
--- a/source4/torture/util.h
+++ b/source4/torture/util.h
@@ -20,7 +20,7 @@
 #ifndef _TORTURE_UTIL_H_
 #define _TORTURE_UTIL_H_
 
-#include "torture/torture.h"
+#include "lib/torture/torture.h"
 
 struct smbcli_state;
 struct smbcli_tree;