CDRIVER-929 line-endings in test data files

Author: ajdavis

.gitattributes

@@ -0,0 +1 @@
+tests/binary/* text eol=lf

.mci.yml

@@ -138,6 +138,7 @@ c_driver_variables:
           make
       msvc: &compile_msvc
         compile_script: |
+          file "tests/binary/gridfs-large.dat"
           set -o errexit
           set -o verbose
           cmake="/cygdrive/c/cmake/bin/cmake"

tests/TestSuite.h

@@ -72,6 +72,16 @@ extern "C" {
 #define ASSERT_CMPINT64(a, eq, b)  ASSERT_CMPINT_HELPER(a, eq, b, PRId64)
 #define ASSERT_CMPUINT64(a, eq, b) ASSERT_CMPINT_HELPER(a, eq, b, PRIu64)
 
+#define ASSERT_MEMCMP(a, b, n) \
+   do { \
+      if (0 != memcmp(a, b, n)) { \
+         fprintf (stderr, \
+                  "Failed comparing %d bytes: \"%.*s\" != \"%.*s\"", \
+                  n, n, a, n, b); \
+         abort (); \
+      }\
+   } while (0)
+
 
 #ifdef ASSERT_ALMOST_EQUAL
 # undef ASSERT_ALMOST_EQUAL

tests/test-mongoc-gridfs.c

@@ -337,23 +337,23 @@ test_read (void)
 
    r = mongoc_gridfs_file_readv (file, iov, 2, 20, 0);
    ASSERT_CMPLONG (r, ==, 20L);
-   ASSERT_CMPINT (memcmp (iov[0].iov_base, "Bacon ipsu", 10), ==, 0);
-   ASSERT_CMPINT (memcmp (iov[1].iov_base, "m dolor si", 10), ==, 0);
+   ASSERT_MEMCMP (iov[0].iov_base, "Bacon ipsu", 10);
+   ASSERT_MEMCMP (iov[1].iov_base, "m dolor si", 10);
 
    ASSERT_CMPINT (mongoc_gridfs_file_seek (file, 1, SEEK_SET), ==, 0);
    r = mongoc_gridfs_file_readv (file, iov, 2, 20, 0);
 
    ASSERT_CMPLONG (r, ==, 20L);
-   ASSERT_CMPINT (memcmp (iov[0].iov_base, "acon ipsum", 10), ==, 0);
-   ASSERT_CMPINT (memcmp (iov[1].iov_base, " dolor sit", 10), ==, 0);
+   ASSERT_MEMCMP (iov[0].iov_base, "acon ipsum", 10);
+   ASSERT_MEMCMP (iov[1].iov_base, " dolor sit", 10);
 
    ASSERT_CMPINT (mongoc_gridfs_file_seek (file, file->chunk_size-1, SEEK_SET), ==, 0);
    r = mongoc_gridfs_file_readv (file, iov, 2, 20, 0);
 
    ASSERT_CMPLONG (r, ==, 20L);
    ASSERT_CMPINT64 (mongoc_gridfs_file_tell (file), ==, (uint64_t)(file->chunk_size+19));
-   ASSERT_CMPINT (memcmp (iov[0].iov_base, "turducken ", 10), ==, 0);
-   ASSERT_CMPINT (memcmp (iov[1].iov_base, "spare ribs", 10), ==, 0);
+   ASSERT_MEMCMP (iov[0].iov_base, "turducken ", 10);
+   ASSERT_MEMCMP (iov[1].iov_base, "spare ribs", 10);
 
    assert (mongoc_gridfs_file_seek (file, 20, SEEK_END) == 0);
    previous_errno = errno;