Merge pull request #1657 from kientzle/ReorganizeTestCode

Reorganize test code a bit

diff --cc libarchive/test/test_write_format_7zip_large.c
index 9c5408cb2469ed3b8d16d2a2c3b543a61c9ee2c6,10daddc2745c168d31dbf79e953bde7e4c5c7b74..b7a90d187bae88fbf06c4a650997af3798fca2e4
--- 1/libarchive/test/test_write_format_7zip_large.c
--- 2/libarchive/test/test_write_format_7zip_large.c
+++ b/libarchive/test/test_write_format_7zip_large.c
@@@ -25,10 -25,9 +25,9 @@@
  
  
  #include "test.h"
- #include "test_utils.h"
  __FBSDID("$FreeBSD$");
  
 -#define LARGE_SIZE    (16*1024*1024)
 +#define LARGE_SIZE    (1*1024*1024)
  static void
  test_large(const char *compression_type)
  {