diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-13 21:31:06 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-13 21:31:06 +0200 |
| commit | 225a65da2d3c675dba8bd2330dd56f949e21fa4b (patch) | |
| tree | b4ddf8afb3d2db19e1fd6b31b45fd01f51243157 | |
| parent | 8ed6f6d5a825c8b0e8d66d30877a91a96fe6e7a4 (diff) | |
| download | samba-225a65da2d3c675dba8bd2330dd56f949e21fa4b.tar.gz samba-225a65da2d3c675dba8bd2330dd56f949e21fa4b.tar.bz2 samba-225a65da2d3c675dba8bd2330dd56f949e21fa4b.zip | |
Attempt to fix get_value() test on sparc machines.
(This used to be commit 10102d80d0f78777a69f6b3b1e5606d7d56b7254)
| -rw-r--r-- | source4/lib/registry/tests/hive.c | 2 | ||||
| -rw-r--r-- | source4/torture/ui.h | 9 |
2 files changed, 10 insertions, 1 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/torture/ui.h b/source4/torture/ui.h index 6645d9b012..ec4a658d74 100644 --- a/source4/torture/ui.h +++ b/source4/torture/ui.h @@ -253,6 +253,15 @@ void torture_result(struct torture_context *test, } \ } while(0) +#define torture_assert_mem_equal(torture_ctx,got,expected,len,cmt)\ + do { const void *__got = (got), *__expected = (expected); \ + if (memcmp(__got, __expected, len) != 0) { \ + torture_result(torture_ctx, TORTURE_FAIL, \ + __location__": "#got" of len %d did not match"#expected": %s", len, cmt); \ + return false; \ + } \ + } while(0) + #define torture_assert_file_contains_text(torture_ctx,filename,expected,cmt)\ do { \ char *__got; \ |