summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-01-05 13:12:26 +0100
committerVolker Lendecke <vlendec@samba.org>2012-01-05 22:01:00 +0100
commitf994f0a3424b235c48f68beef7817f245fc0a47c (patch)
tree756031777e0b8257160908fa13baa5076b3cac1f
parentc790b3c8a76542f06f3ced640500969aaa68a4fe (diff)
downloadsamba-f994f0a3424b235c48f68beef7817f245fc0a47c.tar.gz
samba-f994f0a3424b235c48f68beef7817f245fc0a47c.tar.bz2
samba-f994f0a3424b235c48f68beef7817f245fc0a47c.zip
Fix the local-memcache test for 64-bit
The memcache test walks the purge functionality. The maximum memcache size also takes all memcache internal headers into account. Those headers contain pointers, so on 64-bit they take more space... Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Thu Jan 5 22:01:00 CET 2012 on sn-devel-104
-rw-r--r--selftest/knownfail1
-rw-r--r--source3/torture/torture.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index 220df1c232..4a9f99e8cd 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -6,7 +6,6 @@
^samba3.blackbox.failure.failure # this is designed to fail, for testing our test infrastructure
.*driver.add_driver_timestamps # we only can store dates, not timestamps
-^samba3.smbtorture_s3.LOCAL-MEMCACHE #fails
^samba3.smbtorture_s3.LOCAL-TALLOC-DICT #fails
^samba3.posix_s3.nbt.dgram.*netlogon2
^samba3.*rap.sam.*.useradd # Not provided by Samba 3
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 8535333a28..8bc9cefeef 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -8314,7 +8314,7 @@ static bool run_local_memcache(int dummy)
size_t size1, size2;
bool ret = false;
- cache = memcache_init(NULL, 100);
+ cache = memcache_init(NULL, sizeof(void *) == 8 ? 200 : 100);
if (cache == NULL) {
printf("memcache_init failed\n");