Attempt to fix get_value() test on sparc machines.

(This used to be commit 10102d80d0f78777a69f6b3b1e5606d7d56b7254)

diff --git a/source4/lib/registry/tests/hive.c b/source4/lib/registry/tests/hive.c
index 70b0241b043a241c575075f3acd0479bf585b7fc..a16736c761dec4b6415eca49875bd4937369b70e 100644 (file)
--- 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 6645d9b012852eb9ff52577cded922525235ba3c..ec4a658d741fffd7d468433e586e43cf9059a451 100644 (file)
--- 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; \