Merge topic 'update-libarchive'

6c611c6 libarchive: Restore CMake 2.6.3 as minimum version
2f5b677 libarchive: Update README-CMake.txt for new snapshot
156cb3b Merge branch 'libarchive-upstream' into update-libarchive
fd42bf1 libarchive: Set .gitattributes to allow trailing whitespace
4f4fe6e libarchive 3.0.2-r4051 (reduced)
65b6e19 libarchive: Avoid bogus conversion warning from PGI compiler
9ccaeb1 libarchive: Suppress PathScale compiler warnings
2309438 libarchive: Rename isoent_rr_move_dir parameter isoent => curent
b6ca96e libarchive: Include linux/types.h before linux/fiemap.h
f293b73 libarchive: Define _XOPEN_SOURCE=500 on HP-UX
6781a09 libarchive: Cleanup after ZLIB_WINAPI check
f15d757 libarchive: Remove hard-coded build configuration
3a9f449 libarchive: Use Apple copyfile.h API only if available
6af6b96 libarchive: Do not use MNT_NOATIME if not defined
02d5e40 libarchive: Check for 'struct statvfs' member 'f_iosize'
8b7ee30 libarchive: Do not use ST_NOATIME if not defined
...

1 files changed, 0 insertions, 89 deletions

diff --git a/Utilities/cmlibarchive/libarchive/test/test_read_large.c b/Utilities/cmlibarchive/libarchive/test/test_read_large.c
deleted file mode 100644
index f957395..0000000
--- a/Utilities/cmlibarchive/libarchive/test/test_read_large.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 2003-2007 Tim Kientzle
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_large.c,v 1.4 2008/09/01 05:38:33 kientzle Exp $");
-
-static unsigned char testdata[10 * 1024 * 1024];
-static unsigned char testdatacopy[10 * 1024 * 1024];
-static unsigned char buff[11 * 1024 * 1024];
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#define open _open
-#define close _close
-#endif
-
-/* Check correct behavior on large reads. */
-DEFINE_TEST(test_read_large)
-{
-    unsigned int i;
-    int tmpfilefd;
-    char tmpfilename[] = "test-read_large.XXXXXX";
-    size_t used;
-    struct archive *a;
-    struct archive_entry *entry;
-    FILE *f;
-
-    for (i = 0; i < sizeof(testdata); i++)
-        testdata[i] = (unsigned char)(rand());
-
-    assert(NULL != (a = archive_write_new()));
-    assertA(0 == archive_write_set_format_ustar(a));
-    assertA(0 == archive_write_open_memory(a, buff, sizeof(buff), &used));
-    assert(NULL != (entry = archive_entry_new()));
-    archive_entry_set_size(entry, sizeof(testdata));
-    archive_entry_set_mode(entry, S_IFREG | 0777);
-    archive_entry_set_pathname(entry, "test");
-    assertA(0 == archive_write_header(a, entry));
-    archive_entry_free(entry);
-    assertA(sizeof(testdata) == archive_write_data(a, testdata, sizeof(testdata)));
-    assertA(0 == archive_write_finish(a));
-
-    assert(NULL != (a = archive_read_new()));
-    assertA(0 == archive_read_support_format_all(a));
-    assertA(0 == archive_read_support_compression_all(a));
-    assertA(0 == archive_read_open_memory(a, buff, sizeof(buff)));
-    assertA(0 == archive_read_next_header(a, &entry));
-    assertA(0 == archive_read_data_into_buffer(a, testdatacopy, sizeof(testdatacopy)));
-    assertA(0 == archive_read_finish(a));
-    assert(0 == memcmp(testdata, testdatacopy, sizeof(testdata)));
-
-
-    assert(NULL != (a = archive_read_new()));
-    assertA(0 == archive_read_support_format_all(a));
-    assertA(0 == archive_read_support_compression_all(a));
-    assertA(0 == archive_read_open_memory(a, buff, sizeof(buff)));
-    assertA(0 == archive_read_next_header(a, &entry));
-    // TODO: Provide a Windows-friendly version of this?
-    assert(0 < (tmpfilefd = open(tmpfilename,
-            O_WRONLY | O_CREAT | O_BINARY, 0755)));
-    assertA(0 == archive_read_data_into_fd(a, tmpfilefd));
-    close(tmpfilefd);
-    assertA(0 == archive_read_finish(a));
-
-    f = fopen(tmpfilename, "rb");
-    fread(testdatacopy, 1, sizeof(testdatacopy), f);
-    fclose(f);
-    assert(0 == memcmp(testdata, testdatacopy, sizeof(testdata)));
-}