r23677: When I removed data_blob_equal, I clearly didn't test the PIDL code.

Fix these to use the new data_blob_cmp()

Andrew Bartlett
(This used to be commit d2fba8faf03c18f4c79e83d5847e5420377d811b)

diff --git a/source4/pidl/tests/ndr_align.pl b/source4/pidl/tests/ndr_align.pl
index 405b74597c2012c40b4fa7b1be359d8d5afc680b..0824acc501c7cce2c3bd2f8febbfd53b3878d42b 100755 (executable)
--- a/source4/pidl/tests/ndr_align.pl
+++ b/source4/pidl/tests/ndr_align.pl
@@ -29,7 +29,7 @@ test_samba4_ndr('align-uint8-uint16',
 
        result_blob = ndr_push_blob(ndr);
        
-       if (!data_blob_equal(&result_blob, &expected_blob)) 
+       if (data_blob_cmp(&result_blob, &expected_blob) != 0) 
                return 2;
 ');
 
@@ -54,7 +54,7 @@ test_samba4_ndr('align-uint8-uint32',
 
        result_blob = ndr_push_blob(ndr);
        
-       if (!data_blob_equal(&result_blob, &expected_blob)) 
+       if (data_blob_cmp(&result_blob, &expected_blob) != 0) 
                return 2;
 ');
 
@@ -81,7 +81,7 @@ test_samba4_ndr('align-uint8-hyper',
 
        result_blob = ndr_push_blob(ndr);
        
-       if (!data_blob_equal(&result_blob, &expected_blob)) 
+       if (data_blob_cmp(&result_blob, &expected_blob) != 0) 
                return 2;
 ');
 
@@ -108,7 +108,7 @@ test_samba4_ndr('noalignflag-uint8-uint16',
 
        result_blob = ndr_push_blob(ndr);
        
-       if (!data_blob_equal(&result_blob, &expected_blob)) 
+       if (data_blob_cmp(&result_blob, &expected_blob) != 0) 
                return 2;
 ');
 
@@ -138,6 +138,6 @@ test_samba4_ndr('align-blob-align2',
 
        result_blob = ndr_push_blob(ndr);
 
-       if (!data_blob_equal(&result_blob, &expected_blob)) 
+       if (data_blob_cmp(&result_blob, &expected_blob) != 0) 
                return 2;
 ');

diff --git a/source4/pidl/tests/ndr_tagtype.pl b/source4/pidl/tests/ndr_tagtype.pl
index d7839426d5018e90800848e5188ded2655f363f5..f8250a90efd78576b8681f52756b980ad063949c 100755 (executable)
--- a/source4/pidl/tests/ndr_tagtype.pl
+++ b/source4/pidl/tests/ndr_tagtype.pl
@@ -22,7 +22,7 @@ test_samba4_ndr('struct-notypedef', '[public] struct bla { uint8 x; }; ',
 
        result_blob = ndr_push_blob(ndr);
        
-       if (!data_blob_equal(&result_blob, &expected_blob)) 
+       if (data_blob_cmp(&result_blob, &expected_blob) != 0) 
                return 2;
 ');
 
@@ -41,7 +41,7 @@ test_samba4_ndr('struct-notypedef-used', '[public] struct bla { uint8 x; };
 
        result_blob = ndr_push_blob(ndr);
        
-       if (!data_blob_equal(&result_blob, &expected_blob)) 
+       if (data_blob_cmp(&result_blob, &expected_blob) != 0) 
                return 2;
 ');
 
@@ -61,6 +61,6 @@ test_samba4_ndr('struct-notypedef-embedded', 'struct bla { uint8 x; };
 
        result_blob = ndr_push_blob(ndr);
        
-       if (!data_blob_equal(&result_blob, &expected_blob)) 
+       if (data_blob_cmp(&result_blob, &expected_blob) != 0) 
                return 2;
 ');