sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

lib/replace: Try to fix build on HP-UX for os2_delete test

Browse Source 
The issue is that this file is both used in an autoconf test, and
later in a smbtorture test.  Because os2_delete.c does not include
replace.h, bool may not be defined.

So, instead we shift the need for bool to a different header.

(The readdir tests in repdir.m4 are not yet in the waf configure).

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-09-23 13:39:01 +10:00
parent 08d3062fc3
commit 502135df9f
5 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/replace/replace-test.h
View File

@ -1,10 +1,6 @@
#ifndef __LIB_REPLACE_REPLACE_TEST_H__
#define __LIB_REPLACE_REPLACE_TEST_H__
#include <stdbool.h>
struct torture_context;
bool torture_local_replace(struct torture_context *ctx);
int libreplace_test_strptime(void);
int test_readdir_os2_delete(void);
int getifaddrs_test(void);

9
lib/replace/replace-testsuite.h
View File

@ -1,13 +1,10 @@
#ifndef __LIB_REPLACE_REPLACE_TEST_H__
#define __LIB_REPLACE_REPLACE_TEST_H__
#ifndef __LIB_REPLACE_REPLACE_TESTSUITE_H__
#define __LIB_REPLACE_REPLACE_TESTSUITE_H__
#include <stdbool.h>
struct torture_context;
bool torture_local_replace(struct torture_context *ctx);
int libreplace_test_strptime(void);
int test_readdir_os2_delete(void);
int getifaddrs_test(void);
#endif /* __LIB_REPLACE_REPLACE_TEST_H__ */
#endif /* __LIB_REPLACE_REPLACE_TESTSUITE_H__ */

4
lib/replace/test/main.c
View File

@ -24,9 +24,7 @@
*/
#include "replace.h"
struct torture_context;
bool torture_local_replace(struct torture_context *ctx);
#include "replace-testsuite.h"
int main(void)
{

6
lib/replace/test/testsuite.c
View File

@ -24,6 +24,8 @@
*/
#include "replace.h"
#include "replace-test.h"
#include "replace-testsuite.h"
/*
we include all the system/ include files here so that libreplace tests
@ -48,8 +50,6 @@
#define TESTFILE "testfile.dat"
struct torture_context;
bool torture_local_replace(struct torture_context *ctx);
/*
test ftruncate() function
@ -379,8 +379,6 @@ static int test_opendir(void)
return true;
}
extern int test_readdir_os2_delete(void);
static int test_readdir(void)
{
printf("test: readdir\n");

2
source4/torture/local/local.c
View File

@ -24,7 +24,7 @@
#include "torture/auth/proto.h"
#include "../lib/crypto/test_proto.h"
#include "lib/registry/tests/proto.h"
#include "lib/replace/replace-test.h"
#include "lib/replace/replace-testsuite.h"
/* ignore me */ static struct torture_suite *
(*suite_generators[]) (TALLOC_CTX *mem_ctx) =