mirror of
https://github.com/samba-team/samba.git
synced 2025-03-27 22:50:26 +03:00
Move torture directory to top-level.
This commit is contained in:
parent
badfac4412
commit
8beecd42f2
@ -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"
|
||||
|
@ -105,8 +105,6 @@ struct torture_results
|
||||
bool quiet;
|
||||
|
||||
bool returncode;
|
||||
|
||||
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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;
|
||||
|
@ -21,7 +21,7 @@
|
||||
#ifndef __SMBTORTURE_H__
|
||||
#define __SMBTORTURE_H__
|
||||
|
||||
#include "torture/torture.h"
|
||||
#include "lib/torture/torture.h"
|
||||
|
||||
struct smbcli_state;
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user