summaryrefslogtreecommitdiff
path: root/source4/lib/registry
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-04-14 11:32:04 +0200
committerAndrew Tridgell <tridge@samba.org>2008-04-14 11:32:04 +0200
commit7361899e80c1001eb7d7c13b12ba72cbc3b758f2 (patch)
treeb8e7547f0981c487e328b1aad996850a5378fe35 /source4/lib/registry
parent275f32ae2df333c089343dd20fc4efee1bed2b7b (diff)
parent2bb20aa8a8ff1170fd4d2a349a421990b0d7c235 (diff)
downloadsamba-7361899e80c1001eb7d7c13b12ba72cbc3b758f2.tar.gz
samba-7361899e80c1001eb7d7c13b12ba72cbc3b758f2.tar.bz2
samba-7361899e80c1001eb7d7c13b12ba72cbc3b758f2.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 068c973dbeed5b0f5ccab4f780ae7db3535f5910)
Diffstat (limited to 'source4/lib/registry')
-rw-r--r--source4/lib/registry/tests/hive.c2
-rw-r--r--source4/lib/registry/tests/registry.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/registry/tests/hive.c b/source4/lib/registry/tests/hive.c
index 70b0241b04..a16736c761 100644
--- a/source4/lib/registry/tests/hive.c
+++ b/source4/lib/registry/tests/hive.c
@@ -220,7 +220,7 @@ static bool test_get_value(struct torture_context *tctx, const void *test_data)
torture_assert_int_equal(tctx, value.length, 4, "value length");
torture_assert_int_equal(tctx, type, REG_DWORD, "value type");
- torture_assert_int_equal(tctx, data, IVAL(value.data, 0),
+ torture_assert_mem_equal(tctx, &data, value.data, sizeof(uint32_t),
"value data");
return true;
diff --git a/source4/lib/registry/tests/registry.c b/source4/lib/registry/tests/registry.c
index e5e34c11e0..b19a6abffb 100644
--- a/source4/lib/registry/tests/registry.c
+++ b/source4/lib/registry/tests/registry.c
@@ -428,7 +428,7 @@ static bool test_get_value(struct torture_context *tctx, void *_data)
torture_assert_werr_ok(tctx, error, "getting value");
torture_assert_int_equal(tctx, 4, data.length, "value length ok");
- torture_assert(tctx, memcmp(data.data, &value, 4) == 0,
+ torture_assert_mem_equal(tctx, data.data, &value, 4,
"value content ok");
torture_assert_int_equal(tctx, REG_DWORD, type, "value type");
@@ -496,7 +496,7 @@ static bool test_list_values(struct torture_context *tctx, void *_data)
torture_assert_str_equal(tctx, name, "bar", "value name");
torture_assert_int_equal(tctx, 4, data.length, "value length");
- torture_assert(tctx, memcmp(data.data, &value, 4) == 0,
+ torture_assert_mem_equal(tctx, data.data, &value, 4,
"value content");
torture_assert_int_equal(tctx, REG_DWORD, type, "value type");