diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-05-23 00:46:08 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-05-23 00:46:08 +0900 |
| commit | db1106101d16178bddc67ff917a970eea69a3866 (patch) | |
| tree | f88eaef69fabfc34ba67cca8b08974925137745a | |
| parent | b9436e4d12b2918976a7edb5f780b0e27212e08d (diff) | |
Fix compile error without bittorrent support
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Aria2ApiTest.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8920cd94..28a40c47 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -131,8 +131,6 @@ SRCS = option_processing.cc\ AbstractSingleDiskAdaptor.cc AbstractSingleDiskAdaptor.h\ DirectDiskAdaptor.cc DirectDiskAdaptor.h\ MultiDiskAdaptor.cc MultiDiskAdaptor.h\ - PeerSessionResource.cc PeerSessionResource.h\ - BtRegistry.cc BtRegistry.h\ MultiFileAllocationIterator.cc MultiFileAllocationIterator.h\ ByteArrayDiskWriter.cc ByteArrayDiskWriter.h\ ByteArrayDiskWriterFactory.h\ @@ -400,8 +398,10 @@ SRCS += PeerAbstractCommand.cc PeerAbstractCommand.h\ PeerInitiateConnectionCommand.cc PeerInitiateConnectionCommand.h\ PeerInteractionCommand.cc PeerInteractionCommand.h\ Peer.cc Peer.h\ + PeerSessionResource.cc PeerSessionResource.h\ PeerConnection.cc PeerConnection.h\ PeerListenCommand.cc PeerListenCommand.h\ + BtRegistry.cc BtRegistry.h\ RequestSlot.cc RequestSlot.h\ TrackerWatcherCommand.cc TrackerWatcherCommand.h\ PeerChokeCommand.cc PeerChokeCommand.h\ diff --git a/test/Aria2ApiTest.cc b/test/Aria2ApiTest.cc index 1dc5be42..f39130ab 100644 --- a/test/Aria2ApiTest.cc +++ b/test/Aria2ApiTest.cc @@ -73,7 +73,11 @@ void Aria2ApiTest::testAddMetalink() KeyVals options; #ifdef ENABLE_METALINK CPPUNIT_ASSERT_EQUAL(0, addMetalink(session_, &gids, metalinkPath, options)); +#ifdef ENABLE_BITTORRENT CPPUNIT_ASSERT_EQUAL((size_t)2, gids.size()); +#else // !ENABLE_BITTORRENT + CPPUNIT_ASSERT_EQUAL((size_t)1, gids.size()); +#endif // !ENABLE_BITTORRENT gids.clear(); options.push_back(KeyVals::value_type("file-allocation", "foo")); |