From 5ebb7d203bf6e8cdb5037d566176608658539c47 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Sun, 10 Apr 2016 15:10:29 -0400
Subject: [PATCH] Makefile fix

---
 test/Makefile.am           | 67 ++++++++++++++++++++------------------
 test/test_coverage_win.bat | 19 -----------
 2 files changed, 36 insertions(+), 50 deletions(-)
 delete mode 100644 test/test_coverage_win.bat

diff --git a/test/Makefile.am b/test/Makefile.am
index c5300cdf2..442c44b3e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -45,48 +45,53 @@ endif
 TESTS = $(test_programs)
 
 EXTRA_DIST = Jamfile \
+  test_torrents/backslash_path.torrent \
   test_torrents/base.torrent \
-  test_torrents/parent_path.torrent \
+  test_torrents/creation_date.torrent \
+  test_torrents/duplicate_files.torrent \
+  test_torrents/duplicate_web_seeds.torrent \
+  test_torrents/empty_httpseed.torrent \
+  test_torrents/empty_path.torrent \
+  test_torrents/empty_path_multi.torrent \
   test_torrents/hidden_parent_path.torrent \
+  test_torrents/httpseed.torrent \
+  test_torrents/invalid_file_size.torrent \
+  test_torrents/invalid_info.torrent \
+  test_torrents/invalid_name.torrent \
+  test_torrents/invalid_name2.torrent \
+  test_torrents/invalid_name3.torrent \
+  test_torrents/invalid_path_list.torrent \
+  test_torrents/invalid_piece_len.torrent \
+  test_torrents/invalid_pieces.torrent \
+  test_torrents/invalid_root_hash.torrent \
+  test_torrents/invalid_root_hash2.torrent \
+  test_torrents/long_name.torrent \
+  test_torrents/missing_path_list.torrent \
+  test_torrents/missing_piece_len.torrent \
+  test_torrents/negative_file_size.torrent \
+  test_torrents/negative_piece_len.torrent \
+  test_torrents/negative_size.torrent \
+  test_torrents/no_creation_date.torrent \
+  test_torrents/no_name.torrent \
+  test_torrents/pad_file.torrent \
+  test_torrents/parent_path.torrent \
+  test_torrents/root_hash.torrent \
+  test_torrents/sample.torrent \
   test_torrents/single_multi_file.torrent \
   test_torrents/slash_path.torrent \
-  test_torrents/backslash_path.torrent \
+  test_torrents/slash_path2.torrent \
+  test_torrents/slash_path3.torrent \
+  test_torrents/string.torrent \
+  test_torrents/symlink1.torrent \
+  test_torrents/unaligned_pieces.torrent \
   test_torrents/url_list.torrent \
   test_torrents/url_list2.torrent \
   test_torrents/url_list3.torrent \
-  test_torrents/httpseed.torrent \
-  test_torrents/empty_httpseed.torrent \
-  test_torrents/long_name.torrent \
-  test_torrents/whitespace_url.torrent \
-  test_torrents/duplicate_files.torrent \
-  test_torrents/invalid_piece_len.torrent \
-  test_torrents/missing_piece_len.torrent \
-  test_torrents/negative_piece_len.torrent \
-  test_torrents/no_name.torrent \
-  test_torrents/invalid_name.torrent \
-  test_torrents/invalid_name2.torrent \
-  test_torrents/invalid_info.torrent \
-  test_torrents/string.torrent \
-  test_torrents/negative_size.torrent \
-  test_torrents/negative_file_size.torrent \
-  test_torrents/pad_file.torrent \
-  test_torrents/invalid_path_list.torrent \
-  test_torrents/missing_path_list.torrent \
-  test_torrents/invalid_pieces.torrent \
-  test_torrents/unaligned_pieces.torrent \
-  test_torrents/creation_date.torrent \
-  test_torrents/no_creation_date.torrent \
   test_torrents/url_seed.torrent \
   test_torrents/url_seed_multi.torrent \
   test_torrents/url_seed_multi_space.torrent \
   test_torrents/url_seed_multi_space_nolist.torrent \
-  test_torrents/invalid_root_hash.torrent \
-  test_torrents/invalid_root_hash2.torrent \
-  test_torrents/root_hash.torrent \
-  test_torrents/invalid_file_size.torrent \
-  test_torrents/empty_path_multi.torrent \
-  test_torrents/duplicate_web_seeds.torrent \
-  test_torrents/sample.torrent \
+  test_torrents/whitespace_url.torrent \
   mutable_test_torrents/test1.torrent \
   mutable_test_torrents/test1_pad_files.torrent \
   mutable_test_torrents/test1_single.torrent\
diff --git a/test/test_coverage_win.bat b/test/test_coverage_win.bat
deleted file mode 100644
index bb4ed1521..000000000
--- a/test/test_coverage_win.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-REM this is just to get libtorrent built
-bjam -j8 msvc-12.0 invariant-checks=off asserts=off link=shared boost-link=shared test_primitives linkflags=/profile deprecated-functions=off
-
-Vsinstr -coverage ..\bin\msvc-12.0\debug\asserts-off\boost-link-shared\boost-source\debug-iterators-on\deprecated-functions-off\export-extra-on\invariant-checks-off\threading-multi\torrent.dll @vsinstr_excludes.rsp
-
-REM prepare for running all the tests again
-del /s /q bin
-del /q test.coverage
-
-REM add vsperfmon to the path
-set path=%path%;c:\Program Files (x86)\Microsoft Visual Studio 12.0\Team Tools\Performance Tools
-
-Start vsperfmon -coverage -output:test.coverage
-
-REM Now we run all the unit tests to record test coverage
-bjam -j8 msvc-12.0 invariant-checks=off asserts=off link=shared boost-link=shared linkflags=/profile deprecated-functions=off
-
-vsperfcmd -shutdown
-