diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-10-02 10:37:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:04 -0500 |
| commit | 7e310277ff5cb8fcef17e28422db2a99cf3841d3 (patch) | |
| tree | 7e472761adf853899e85e0ca93ed652db5b0626b /source3/lib | |
| parent | f0244fbffee59eeb75b069fd3a5ea6e5452afabb (diff) | |
| download | samba-7e310277ff5cb8fcef17e28422db2a99cf3841d3.tar.gz samba-7e310277ff5cb8fcef17e28422db2a99cf3841d3.tar.bz2 samba-7e310277ff5cb8fcef17e28422db2a99cf3841d3.zip | |
r19034: merge from samba4:
prepare libreplace testsuite for usage in smbtorture
metze
(This used to be commit 281677084e022336877dd141befd508a0b5c08a9)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/replace/test/testsuite.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/lib/replace/test/testsuite.c b/source3/lib/replace/test/testsuite.c index 6644fce6bd..fa5265f66f 100644 --- a/source3/lib/replace/test/testsuite.c +++ b/source3/lib/replace/test/testsuite.c @@ -89,7 +89,7 @@ static int test_strlcpy(void) char buf[4]; const struct { const char *src; - int result; + size_t result; } tests[] = { { "abc", 3 }, { "abcdef", 6 }, @@ -373,9 +373,11 @@ static int test_MAX(void) return true; } -int torture_local_replace(void *ctx) +struct torture_context; + +bool torture_local_replace(struct torture_context *torture) { - int ret = true; + bool ret = true; ret &= test_ftruncate(); ret &= test_strlcpy(); ret &= test_strlcat(); @@ -423,7 +425,7 @@ int torture_local_replace(void *ctx) return ret; } -#if !defined(_SAMBA_BUILD_) || ((SAMBA_VERSION_MAJOR==3)&&(SAMBA_VERSION_MINOR<9)) +#if _SAMBA_BUILD_<4 int main(void) { if (!torture_local_replace(NULL)) { |