mirror of https://github.com/aria2/aria2
Show 1/10 unit in size
Tatsuhiro Tsujikawa
parent
db41dfac20
commit
6f96fdc587
|
|
@ -58,7 +58,7 @@ void TorrentConsoleDownloadEngine::sendStatistics() {
|
||||||
}
|
}
|
||||||
printf(" U:%.2f(%s) %d peers",
|
printf(" U:%.2f(%s) %d peers",
|
||||||
uploadSpeed/1024.0,
|
uploadSpeed/1024.0,
|
||||||
Util::llitos(uploadLength, true).c_str(),
|
Util::abbrevSize(uploadLength).c_str(),
|
||||||
btRuntime->getConnections());
|
btRuntime->getConnections());
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -697,14 +697,16 @@ string Util::abbrevSize(int64_t size)
|
||||||
if(size < 1024) {
|
if(size < 1024) {
|
||||||
return Util::llitos(size, true);
|
return Util::llitos(size, true);
|
||||||
}
|
}
|
||||||
size >>= 10;
|
|
||||||
char units[] = { 'K', 'M' };
|
char units[] = { 'K', 'M' };
|
||||||
int32_t numUnit = sizeof(units)/sizeof(char);
|
int32_t numUnit = sizeof(units)/sizeof(char);
|
||||||
int32_t i = 0;
|
int32_t i = 0;
|
||||||
|
int32_t r = size%1024;
|
||||||
|
size >>= 10;
|
||||||
for(; i < numUnit-1 && size >= 1024; ++i) {
|
for(; i < numUnit-1 && size >= 1024; ++i) {
|
||||||
|
r = size%1024;
|
||||||
size >>= 10;
|
size >>= 10;
|
||||||
}
|
}
|
||||||
return Util::llitos(size, true)+units[i];
|
return Util::llitos(size, true)+"."+Util::itos(r*10/1024)+units[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
time_t Util::httpGMT(const string& httpStdTime)
|
time_t Util::httpGMT(const string& httpStdTime)
|
||||||
|
|
|
||||||
154
test/Makefile.am
154
test/Makefile.am
|
|
@ -1,83 +1,83 @@
|
||||||
TESTS = aria2c
|
TESTS = aria2c
|
||||||
check_PROGRAMS = $(TESTS)
|
check_PROGRAMS = $(TESTS)
|
||||||
aria2c_SOURCES = AllTest.cc\
|
aria2c_SOURCES = AllTest.cc\
|
||||||
CookieBoxTest.cc\
|
UtilTest.cc
|
||||||
RequestTest.cc\
|
# CookieBoxTest.cc\
|
||||||
CookieParserTest.cc\
|
# RequestTest.cc\
|
||||||
HttpRequestTest.cc\
|
# CookieParserTest.cc\
|
||||||
CookieBoxFactoryTest.cc\
|
# HttpRequestTest.cc\
|
||||||
ByteArrayDiskWriterTest.cc\
|
# CookieBoxFactoryTest.cc\
|
||||||
RequestGroupManTest.cc\
|
# ByteArrayDiskWriterTest.cc\
|
||||||
IteratableChecksumValidatorTest.cc\
|
# RequestGroupManTest.cc\
|
||||||
IteratableChunkChecksumValidatorTest.cc\
|
# IteratableChecksumValidatorTest.cc\
|
||||||
UriFileListParserTest.cc\
|
# IteratableChunkChecksumValidatorTest.cc\
|
||||||
PeerTest.cc\
|
# UriFileListParserTest.cc\
|
||||||
DefaultPeerStorageTest.cc\
|
# PeerTest.cc\
|
||||||
RequestFactoryTest.cc\
|
# DefaultPeerStorageTest.cc\
|
||||||
NetrcAuthResolverTest.cc\
|
# RequestFactoryTest.cc\
|
||||||
DefaultAuthResolverTest.cc\
|
# NetrcAuthResolverTest.cc\
|
||||||
UtilTest.cc\
|
# DefaultAuthResolverTest.cc\
|
||||||
OptionHandlerTest.cc\
|
# OptionHandlerTest.cc\
|
||||||
SegmentManTest.cc\
|
# SegmentManTest.cc\
|
||||||
BitfieldManTest.cc\
|
# BitfieldManTest.cc\
|
||||||
GlowFileAllocatorTest.cc\
|
# GlowFileAllocatorTest.cc\
|
||||||
NetrcTest.cc\
|
# NetrcTest.cc\
|
||||||
SingletonHolderTest.cc\
|
# SingletonHolderTest.cc\
|
||||||
HttpHeaderTest.cc\
|
# HttpHeaderTest.cc\
|
||||||
HttpResponseTest.cc\
|
# HttpResponseTest.cc\
|
||||||
SharedHandleTest.cc\
|
# SharedHandleTest.cc\
|
||||||
ChunkedEncodingTest.cc\
|
# ChunkedEncodingTest.cc\
|
||||||
FileTest.cc\
|
# FileTest.cc\
|
||||||
OptionTest.cc\
|
# OptionTest.cc\
|
||||||
Base64Test.cc\
|
# Base64Test.cc\
|
||||||
DataTest.cc\
|
# DataTest.cc\
|
||||||
DictionaryTest.cc\
|
# DictionaryTest.cc\
|
||||||
ListTest.cc\
|
# ListTest.cc\
|
||||||
MetaFileUtilTest.cc\
|
# MetaFileUtilTest.cc\
|
||||||
ShaVisitorTest.cc\
|
# ShaVisitorTest.cc\
|
||||||
PeerMessageUtilTest.cc\
|
# PeerMessageUtilTest.cc\
|
||||||
DefaultDiskWriterTest.cc\
|
# DefaultDiskWriterTest.cc\
|
||||||
MultiDiskAdaptorTest.cc\
|
# MultiDiskAdaptorTest.cc\
|
||||||
Xml2MetalinkProcessorTest.cc\
|
# Xml2MetalinkProcessorTest.cc\
|
||||||
MetalinkerTest.cc\
|
# MetalinkerTest.cc\
|
||||||
MetalinkEntryTest.cc\
|
# MetalinkEntryTest.cc\
|
||||||
FeatureConfigTest.cc\
|
# FeatureConfigTest.cc\
|
||||||
ShareRatioSeedCriteriaTest.cc\
|
# ShareRatioSeedCriteriaTest.cc\
|
||||||
TimeSeedCriteriaTest.cc\
|
# TimeSeedCriteriaTest.cc\
|
||||||
SpeedCalcTest.cc\
|
# SpeedCalcTest.cc\
|
||||||
DefaultPeerListProcessorTest.cc\
|
# DefaultPeerListProcessorTest.cc\
|
||||||
AnnounceListTest.cc\
|
# AnnounceListTest.cc\
|
||||||
TrackerWatcherCommandTest.cc\
|
# TrackerWatcherCommandTest.cc\
|
||||||
DefaultBtContextTest.cc\
|
# DefaultBtContextTest.cc\
|
||||||
DefaultPieceStorageTest.cc\
|
# DefaultPieceStorageTest.cc\
|
||||||
DefaultBtAnnounceTest.cc\
|
# DefaultBtAnnounceTest.cc\
|
||||||
BtRegistryTest.cc\
|
# BtRegistryTest.cc\
|
||||||
DefaultBtMessageDispatcherTest.cc\
|
# DefaultBtMessageDispatcherTest.cc\
|
||||||
MockPeerStorage.h\
|
# MockPeerStorage.h\
|
||||||
DefaultBtRequestFactoryTest.cc\
|
# DefaultBtRequestFactoryTest.cc\
|
||||||
BtAllowedFastMessageTest.cc\
|
# BtAllowedFastMessageTest.cc\
|
||||||
BtBitfieldMessageTest.cc\
|
# BtBitfieldMessageTest.cc\
|
||||||
BtCancelMessageTest.cc\
|
# BtCancelMessageTest.cc\
|
||||||
BtChokeMessageTest.cc\
|
# BtChokeMessageTest.cc\
|
||||||
BtHaveAllMessageTest.cc\
|
# BtHaveAllMessageTest.cc\
|
||||||
BtHaveMessageTest.cc\
|
# BtHaveMessageTest.cc\
|
||||||
BtHaveNoneMessageTest.cc\
|
# BtHaveNoneMessageTest.cc\
|
||||||
BtInterestedMessageTest.cc\
|
# BtInterestedMessageTest.cc\
|
||||||
BtKeepAliveMessageTest.cc\
|
# BtKeepAliveMessageTest.cc\
|
||||||
BtNotInterestedMessageTest.cc\
|
# BtNotInterestedMessageTest.cc\
|
||||||
BtPieceMessageTest.cc\
|
# BtPieceMessageTest.cc\
|
||||||
BtPortMessageTest.cc\
|
# BtPortMessageTest.cc\
|
||||||
BtRejectMessageTest.cc\
|
# BtRejectMessageTest.cc\
|
||||||
BtRequestMessageTest.cc\
|
# BtRequestMessageTest.cc\
|
||||||
BtSuggestPieceMessageTest.cc\
|
# BtSuggestPieceMessageTest.cc\
|
||||||
BtUnchokeMessageTest.cc\
|
# BtUnchokeMessageTest.cc\
|
||||||
BtHandshakeMessageTest.cc\
|
# BtHandshakeMessageTest.cc\
|
||||||
MockBtMessageDispatcher.h\
|
# MockBtMessageDispatcher.h\
|
||||||
FixedNumberRandomizer.h\
|
# FixedNumberRandomizer.h\
|
||||||
MockBtMessageFactory.h\
|
# MockBtMessageFactory.h\
|
||||||
MockBtMessage.h\
|
# MockBtMessage.h\
|
||||||
ConsoleFileAllocationMonitorTest.cc\
|
# ConsoleFileAllocationMonitorTest.cc\
|
||||||
ChunkChecksumValidatorTest.cc
|
# ChunkChecksumValidatorTest.cc
|
||||||
#aria2c_CXXFLAGS = ${CPPUNIT_CFLAGS} -I../src -I../lib -Wall -D_FILE_OFFSET_BITS=64
|
#aria2c_CXXFLAGS = ${CPPUNIT_CFLAGS} -I../src -I../lib -Wall -D_FILE_OFFSET_BITS=64
|
||||||
#aria2c_LDFLAGS = ${CPPUNIT_LIBS}
|
#aria2c_LDFLAGS = ${CPPUNIT_LIBS}
|
||||||
|
|
||||||
|
|
|
||||||
276
test/Makefile.in
276
test/Makefile.in
|
|
@ -57,52 +57,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
CONFIG_HEADER = $(top_builddir)/config.h
|
CONFIG_HEADER = $(top_builddir)/config.h
|
||||||
CONFIG_CLEAN_FILES =
|
CONFIG_CLEAN_FILES =
|
||||||
am__EXEEXT_1 = aria2c$(EXEEXT)
|
am__EXEEXT_1 = aria2c$(EXEEXT)
|
||||||
am_aria2c_OBJECTS = AllTest.$(OBJEXT) CookieBoxTest.$(OBJEXT) \
|
am_aria2c_OBJECTS = AllTest.$(OBJEXT) UtilTest.$(OBJEXT)
|
||||||
RequestTest.$(OBJEXT) CookieParserTest.$(OBJEXT) \
|
|
||||||
HttpRequestTest.$(OBJEXT) CookieBoxFactoryTest.$(OBJEXT) \
|
|
||||||
ByteArrayDiskWriterTest.$(OBJEXT) \
|
|
||||||
RequestGroupManTest.$(OBJEXT) \
|
|
||||||
IteratableChecksumValidatorTest.$(OBJEXT) \
|
|
||||||
IteratableChunkChecksumValidatorTest.$(OBJEXT) \
|
|
||||||
UriFileListParserTest.$(OBJEXT) PeerTest.$(OBJEXT) \
|
|
||||||
DefaultPeerStorageTest.$(OBJEXT) RequestFactoryTest.$(OBJEXT) \
|
|
||||||
NetrcAuthResolverTest.$(OBJEXT) \
|
|
||||||
DefaultAuthResolverTest.$(OBJEXT) UtilTest.$(OBJEXT) \
|
|
||||||
OptionHandlerTest.$(OBJEXT) SegmentManTest.$(OBJEXT) \
|
|
||||||
BitfieldManTest.$(OBJEXT) GlowFileAllocatorTest.$(OBJEXT) \
|
|
||||||
NetrcTest.$(OBJEXT) SingletonHolderTest.$(OBJEXT) \
|
|
||||||
HttpHeaderTest.$(OBJEXT) HttpResponseTest.$(OBJEXT) \
|
|
||||||
SharedHandleTest.$(OBJEXT) ChunkedEncodingTest.$(OBJEXT) \
|
|
||||||
FileTest.$(OBJEXT) OptionTest.$(OBJEXT) Base64Test.$(OBJEXT) \
|
|
||||||
DataTest.$(OBJEXT) DictionaryTest.$(OBJEXT) ListTest.$(OBJEXT) \
|
|
||||||
MetaFileUtilTest.$(OBJEXT) ShaVisitorTest.$(OBJEXT) \
|
|
||||||
PeerMessageUtilTest.$(OBJEXT) DefaultDiskWriterTest.$(OBJEXT) \
|
|
||||||
MultiDiskAdaptorTest.$(OBJEXT) \
|
|
||||||
Xml2MetalinkProcessorTest.$(OBJEXT) MetalinkerTest.$(OBJEXT) \
|
|
||||||
MetalinkEntryTest.$(OBJEXT) FeatureConfigTest.$(OBJEXT) \
|
|
||||||
ShareRatioSeedCriteriaTest.$(OBJEXT) \
|
|
||||||
TimeSeedCriteriaTest.$(OBJEXT) SpeedCalcTest.$(OBJEXT) \
|
|
||||||
DefaultPeerListProcessorTest.$(OBJEXT) \
|
|
||||||
AnnounceListTest.$(OBJEXT) TrackerWatcherCommandTest.$(OBJEXT) \
|
|
||||||
DefaultBtContextTest.$(OBJEXT) \
|
|
||||||
DefaultPieceStorageTest.$(OBJEXT) \
|
|
||||||
DefaultBtAnnounceTest.$(OBJEXT) BtRegistryTest.$(OBJEXT) \
|
|
||||||
DefaultBtMessageDispatcherTest.$(OBJEXT) \
|
|
||||||
DefaultBtRequestFactoryTest.$(OBJEXT) \
|
|
||||||
BtAllowedFastMessageTest.$(OBJEXT) \
|
|
||||||
BtBitfieldMessageTest.$(OBJEXT) BtCancelMessageTest.$(OBJEXT) \
|
|
||||||
BtChokeMessageTest.$(OBJEXT) BtHaveAllMessageTest.$(OBJEXT) \
|
|
||||||
BtHaveMessageTest.$(OBJEXT) BtHaveNoneMessageTest.$(OBJEXT) \
|
|
||||||
BtInterestedMessageTest.$(OBJEXT) \
|
|
||||||
BtKeepAliveMessageTest.$(OBJEXT) \
|
|
||||||
BtNotInterestedMessageTest.$(OBJEXT) \
|
|
||||||
BtPieceMessageTest.$(OBJEXT) BtPortMessageTest.$(OBJEXT) \
|
|
||||||
BtRejectMessageTest.$(OBJEXT) BtRequestMessageTest.$(OBJEXT) \
|
|
||||||
BtSuggestPieceMessageTest.$(OBJEXT) \
|
|
||||||
BtUnchokeMessageTest.$(OBJEXT) \
|
|
||||||
BtHandshakeMessageTest.$(OBJEXT) \
|
|
||||||
ConsoleFileAllocationMonitorTest.$(OBJEXT) \
|
|
||||||
ChunkChecksumValidatorTest.$(OBJEXT)
|
|
||||||
aria2c_OBJECTS = $(am_aria2c_OBJECTS)
|
aria2c_OBJECTS = $(am_aria2c_OBJECTS)
|
||||||
am__DEPENDENCIES_1 =
|
am__DEPENDENCIES_1 =
|
||||||
aria2c_DEPENDENCIES = ../src/libaria2c.a $(am__DEPENDENCIES_1)
|
aria2c_DEPENDENCIES = ../src/libaria2c.a $(am__DEPENDENCIES_1)
|
||||||
|
|
@ -114,10 +69,6 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||||
CXXLD = $(CXX)
|
CXXLD = $(CXX)
|
||||||
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
|
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
|
||||||
-o $@
|
-o $@
|
||||||
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
|
||||||
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
||||||
CCLD = $(CC)
|
|
||||||
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
|
||||||
SOURCES = $(aria2c_SOURCES)
|
SOURCES = $(aria2c_SOURCES)
|
||||||
DIST_SOURCES = $(aria2c_SOURCES)
|
DIST_SOURCES = $(aria2c_SOURCES)
|
||||||
ETAGS = etags
|
ETAGS = etags
|
||||||
|
|
@ -267,84 +218,84 @@ sysconfdir = @sysconfdir@
|
||||||
target_alias = @target_alias@
|
target_alias = @target_alias@
|
||||||
TESTS = aria2c
|
TESTS = aria2c
|
||||||
aria2c_SOURCES = AllTest.cc\
|
aria2c_SOURCES = AllTest.cc\
|
||||||
CookieBoxTest.cc\
|
UtilTest.cc
|
||||||
RequestTest.cc\
|
|
||||||
CookieParserTest.cc\
|
|
||||||
HttpRequestTest.cc\
|
|
||||||
CookieBoxFactoryTest.cc\
|
|
||||||
ByteArrayDiskWriterTest.cc\
|
|
||||||
RequestGroupManTest.cc\
|
|
||||||
IteratableChecksumValidatorTest.cc\
|
|
||||||
IteratableChunkChecksumValidatorTest.cc\
|
|
||||||
UriFileListParserTest.cc\
|
|
||||||
PeerTest.cc\
|
|
||||||
DefaultPeerStorageTest.cc\
|
|
||||||
RequestFactoryTest.cc\
|
|
||||||
NetrcAuthResolverTest.cc\
|
|
||||||
DefaultAuthResolverTest.cc\
|
|
||||||
UtilTest.cc\
|
|
||||||
OptionHandlerTest.cc\
|
|
||||||
SegmentManTest.cc\
|
|
||||||
BitfieldManTest.cc\
|
|
||||||
GlowFileAllocatorTest.cc\
|
|
||||||
NetrcTest.cc\
|
|
||||||
SingletonHolderTest.cc\
|
|
||||||
HttpHeaderTest.cc\
|
|
||||||
HttpResponseTest.cc\
|
|
||||||
SharedHandleTest.cc\
|
|
||||||
ChunkedEncodingTest.cc\
|
|
||||||
FileTest.cc\
|
|
||||||
OptionTest.cc\
|
|
||||||
Base64Test.cc\
|
|
||||||
DataTest.cc\
|
|
||||||
DictionaryTest.cc\
|
|
||||||
ListTest.cc\
|
|
||||||
MetaFileUtilTest.cc\
|
|
||||||
ShaVisitorTest.cc\
|
|
||||||
PeerMessageUtilTest.cc\
|
|
||||||
DefaultDiskWriterTest.cc\
|
|
||||||
MultiDiskAdaptorTest.cc\
|
|
||||||
Xml2MetalinkProcessorTest.cc\
|
|
||||||
MetalinkerTest.cc\
|
|
||||||
MetalinkEntryTest.cc\
|
|
||||||
FeatureConfigTest.cc\
|
|
||||||
ShareRatioSeedCriteriaTest.cc\
|
|
||||||
TimeSeedCriteriaTest.cc\
|
|
||||||
SpeedCalcTest.cc\
|
|
||||||
DefaultPeerListProcessorTest.cc\
|
|
||||||
AnnounceListTest.cc\
|
|
||||||
TrackerWatcherCommandTest.cc\
|
|
||||||
DefaultBtContextTest.cc\
|
|
||||||
DefaultPieceStorageTest.cc\
|
|
||||||
DefaultBtAnnounceTest.cc\
|
|
||||||
BtRegistryTest.cc\
|
|
||||||
DefaultBtMessageDispatcherTest.cc\
|
|
||||||
MockPeerStorage.h\
|
|
||||||
DefaultBtRequestFactoryTest.cc\
|
|
||||||
BtAllowedFastMessageTest.cc\
|
|
||||||
BtBitfieldMessageTest.cc\
|
|
||||||
BtCancelMessageTest.cc\
|
|
||||||
BtChokeMessageTest.cc\
|
|
||||||
BtHaveAllMessageTest.cc\
|
|
||||||
BtHaveMessageTest.cc\
|
|
||||||
BtHaveNoneMessageTest.cc\
|
|
||||||
BtInterestedMessageTest.cc\
|
|
||||||
BtKeepAliveMessageTest.cc\
|
|
||||||
BtNotInterestedMessageTest.cc\
|
|
||||||
BtPieceMessageTest.cc\
|
|
||||||
BtPortMessageTest.cc\
|
|
||||||
BtRejectMessageTest.cc\
|
|
||||||
BtRequestMessageTest.cc\
|
|
||||||
BtSuggestPieceMessageTest.cc\
|
|
||||||
BtUnchokeMessageTest.cc\
|
|
||||||
BtHandshakeMessageTest.cc\
|
|
||||||
MockBtMessageDispatcher.h\
|
|
||||||
FixedNumberRandomizer.h\
|
|
||||||
MockBtMessageFactory.h\
|
|
||||||
MockBtMessage.h\
|
|
||||||
ConsoleFileAllocationMonitorTest.cc\
|
|
||||||
ChunkChecksumValidatorTest.cc
|
|
||||||
|
|
||||||
|
# CookieBoxTest.cc\
|
||||||
|
# RequestTest.cc\
|
||||||
|
# CookieParserTest.cc\
|
||||||
|
# HttpRequestTest.cc\
|
||||||
|
# CookieBoxFactoryTest.cc\
|
||||||
|
# ByteArrayDiskWriterTest.cc\
|
||||||
|
# RequestGroupManTest.cc\
|
||||||
|
# IteratableChecksumValidatorTest.cc\
|
||||||
|
# IteratableChunkChecksumValidatorTest.cc\
|
||||||
|
# UriFileListParserTest.cc\
|
||||||
|
# PeerTest.cc\
|
||||||
|
# DefaultPeerStorageTest.cc\
|
||||||
|
# RequestFactoryTest.cc\
|
||||||
|
# NetrcAuthResolverTest.cc\
|
||||||
|
# DefaultAuthResolverTest.cc\
|
||||||
|
# OptionHandlerTest.cc\
|
||||||
|
# SegmentManTest.cc\
|
||||||
|
# BitfieldManTest.cc\
|
||||||
|
# GlowFileAllocatorTest.cc\
|
||||||
|
# NetrcTest.cc\
|
||||||
|
# SingletonHolderTest.cc\
|
||||||
|
# HttpHeaderTest.cc\
|
||||||
|
# HttpResponseTest.cc\
|
||||||
|
# SharedHandleTest.cc\
|
||||||
|
# ChunkedEncodingTest.cc\
|
||||||
|
# FileTest.cc\
|
||||||
|
# OptionTest.cc\
|
||||||
|
# Base64Test.cc\
|
||||||
|
# DataTest.cc\
|
||||||
|
# DictionaryTest.cc\
|
||||||
|
# ListTest.cc\
|
||||||
|
# MetaFileUtilTest.cc\
|
||||||
|
# ShaVisitorTest.cc\
|
||||||
|
# PeerMessageUtilTest.cc\
|
||||||
|
# DefaultDiskWriterTest.cc\
|
||||||
|
# MultiDiskAdaptorTest.cc\
|
||||||
|
# Xml2MetalinkProcessorTest.cc\
|
||||||
|
# MetalinkerTest.cc\
|
||||||
|
# MetalinkEntryTest.cc\
|
||||||
|
# FeatureConfigTest.cc\
|
||||||
|
# ShareRatioSeedCriteriaTest.cc\
|
||||||
|
# TimeSeedCriteriaTest.cc\
|
||||||
|
# SpeedCalcTest.cc\
|
||||||
|
# DefaultPeerListProcessorTest.cc\
|
||||||
|
# AnnounceListTest.cc\
|
||||||
|
# TrackerWatcherCommandTest.cc\
|
||||||
|
# DefaultBtContextTest.cc\
|
||||||
|
# DefaultPieceStorageTest.cc\
|
||||||
|
# DefaultBtAnnounceTest.cc\
|
||||||
|
# BtRegistryTest.cc\
|
||||||
|
# DefaultBtMessageDispatcherTest.cc\
|
||||||
|
# MockPeerStorage.h\
|
||||||
|
# DefaultBtRequestFactoryTest.cc\
|
||||||
|
# BtAllowedFastMessageTest.cc\
|
||||||
|
# BtBitfieldMessageTest.cc\
|
||||||
|
# BtCancelMessageTest.cc\
|
||||||
|
# BtChokeMessageTest.cc\
|
||||||
|
# BtHaveAllMessageTest.cc\
|
||||||
|
# BtHaveMessageTest.cc\
|
||||||
|
# BtHaveNoneMessageTest.cc\
|
||||||
|
# BtInterestedMessageTest.cc\
|
||||||
|
# BtKeepAliveMessageTest.cc\
|
||||||
|
# BtNotInterestedMessageTest.cc\
|
||||||
|
# BtPieceMessageTest.cc\
|
||||||
|
# BtPortMessageTest.cc\
|
||||||
|
# BtRejectMessageTest.cc\
|
||||||
|
# BtRequestMessageTest.cc\
|
||||||
|
# BtSuggestPieceMessageTest.cc\
|
||||||
|
# BtUnchokeMessageTest.cc\
|
||||||
|
# BtHandshakeMessageTest.cc\
|
||||||
|
# MockBtMessageDispatcher.h\
|
||||||
|
# FixedNumberRandomizer.h\
|
||||||
|
# MockBtMessageFactory.h\
|
||||||
|
# MockBtMessage.h\
|
||||||
|
# ConsoleFileAllocationMonitorTest.cc\
|
||||||
|
# ChunkChecksumValidatorTest.cc
|
||||||
#aria2c_CXXFLAGS = ${CPPUNIT_CFLAGS} -I../src -I../lib -Wall -D_FILE_OFFSET_BITS=64
|
#aria2c_CXXFLAGS = ${CPPUNIT_CFLAGS} -I../src -I../lib -Wall -D_FILE_OFFSET_BITS=64
|
||||||
#aria2c_LDFLAGS = ${CPPUNIT_LIBS}
|
#aria2c_LDFLAGS = ${CPPUNIT_LIBS}
|
||||||
aria2c_LDADD = ../src/libaria2c.a\
|
aria2c_LDADD = ../src/libaria2c.a\
|
||||||
|
|
@ -407,78 +358,7 @@ distclean-compile:
|
||||||
-rm -f *.tab.c
|
-rm -f *.tab.c
|
||||||
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AllTest.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AllTest.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AnnounceListTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Base64Test.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BitfieldManTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtAllowedFastMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtBitfieldMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtCancelMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtChokeMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtHandshakeMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtHaveAllMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtHaveMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtHaveNoneMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtInterestedMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtKeepAliveMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtNotInterestedMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtPieceMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtPortMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtRegistryTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtRejectMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtRequestMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtSuggestPieceMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtUnchokeMessageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ByteArrayDiskWriterTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChunkChecksumValidatorTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChunkedEncodingTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConsoleFileAllocationMonitorTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CookieBoxFactoryTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CookieBoxTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CookieParserTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DataTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultAuthResolverTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultBtAnnounceTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultBtContextTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultBtMessageDispatcherTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultBtRequestFactoryTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultDiskWriterTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultPeerListProcessorTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultPeerStorageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultPieceStorageTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DictionaryTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FeatureConfigTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GlowFileAllocatorTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HttpHeaderTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HttpRequestTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HttpResponseTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IteratableChecksumValidatorTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IteratableChunkChecksumValidatorTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ListTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetaFileUtilTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetalinkEntryTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetalinkerTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MultiDiskAdaptorTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetrcAuthResolverTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetrcTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OptionHandlerTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OptionTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerMessageUtilTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RequestFactoryTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RequestGroupManTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RequestTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SegmentManTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShaVisitorTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShareRatioSeedCriteriaTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SharedHandleTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SingletonHolderTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SpeedCalcTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TimeSeedCriteriaTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TrackerWatcherCommandTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UriFileListParserTest.Po@am__quote@
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UtilTest.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UtilTest.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Xml2MetalinkProcessorTest.Po@am__quote@
|
|
||||||
|
|
||||||
.cc.o:
|
.cc.o:
|
||||||
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||||
|
|
|
||||||
|
|
@ -304,8 +304,11 @@ void UtilTest::testGetRealSize()
|
||||||
|
|
||||||
void UtilTest::testAbbrevSize()
|
void UtilTest::testAbbrevSize()
|
||||||
{
|
{
|
||||||
CPPUNIT_ASSERT_EQUAL(string("4,096M"), Util::abbrevSize(4294967296LL));
|
CPPUNIT_ASSERT_EQUAL(string("4,096.0M"), Util::abbrevSize(4294967296LL));
|
||||||
CPPUNIT_ASSERT_EQUAL(string("1K"), Util::abbrevSize(1024));
|
CPPUNIT_ASSERT_EQUAL(string("1.0K"), Util::abbrevSize(1024));
|
||||||
CPPUNIT_ASSERT_EQUAL(string("1,023"), Util::abbrevSize(1023));
|
CPPUNIT_ASSERT_EQUAL(string("1,023"), Util::abbrevSize(1023));
|
||||||
CPPUNIT_ASSERT_EQUAL(string("0"), Util::abbrevSize(0));
|
CPPUNIT_ASSERT_EQUAL(string("0"), Util::abbrevSize(0));
|
||||||
|
CPPUNIT_ASSERT_EQUAL(string("1.1K"), Util::abbrevSize(1127));
|
||||||
|
CPPUNIT_ASSERT_EQUAL(string("1.5M"), Util::abbrevSize(1572864));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue