Subject: [Boost-commit] svn:boost r72351 - sandbox/bloom_filter/trunk/libs/bloom_filter/test
From: cpp.cabrera_at_[hidden]
Date: 2011-06-02 17:46:25
Author: alejandro
Date: 2011-06-02 17:46:24 EDT (Thu, 02 Jun 2011)
New Revision: 72351
URL: http://svn.boost.org/trac/boost/changeset/72351
Log:
Jamfile works now (Linux). Test source warnings cleaned up. Makefile removed.
Removed:
sandbox/bloom_filter/trunk/libs/bloom_filter/test/makefile
Text files modified:
sandbox/bloom_filter/trunk/libs/bloom_filter/test/Jamfile.v2 | 17 +----------------
sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp | 13 ++++++-------
2 files changed, 7 insertions(+), 23 deletions(-)
Modified: sandbox/bloom_filter/trunk/libs/bloom_filter/test/Jamfile.v2
==============================================================================
--- sandbox/bloom_filter/trunk/libs/bloom_filter/test/Jamfile.v2 (original)
+++ sandbox/bloom_filter/trunk/libs/bloom_filter/test/Jamfile.v2 2011-06-02 17:46:24 EDT (Thu, 02 Jun 2011)
@@ -6,11 +6,6 @@
# See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt
# See library home page at http://www.boost.org/libs/ratio
-
-# uncomment one of the above lines if you build outside the Boost release
-local BOOST_ROOT = /home/alejandro/Downloads/boost_1_46_1 ;
-#local BOOST_ROOT = c:/cygwin/boost_1_41_0 ;
-
if ! $(BOOST_ROOT)
{
BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ;
@@ -18,23 +13,13 @@
project
: requirements
- <os>LINUX:<threading>multi
- # uncomment the line below if you build outside the Boost release
- <include>$(BOOST_ROOT)
- # uncomment the line below if you build outside the Boost release
- <include>../../..
- <toolset>msvc:<asynch-exceptions>on
+ <library>../../test/build//boost_unit_test_framework/<link>shared
<define>BOOST_ENABLE_WARNINGS
<warnings>all
- <toolset>gcc:<cxxflags>-Wextra
- <toolset>gcc:<cxxflags>-Wall
- <toolset>gcc:<cxxflags>-ansi
- <toolset>gcc:<cxxflags>-pedantic
;
test-suite "basic"
:
- [ compile boost_test.cpp ]
[ run boost_test.cpp ]
;
Modified: sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp
==============================================================================
--- sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp (original)
+++ sandbox/bloom_filter/trunk/libs/bloom_filter/test/boost_test.cpp 2011-06-02 17:46:24 EDT (Thu, 02 Jun 2011)
@@ -9,7 +9,6 @@
// See http://www.boost.org/libs/bloom_filter for documentation.
//
//////////////////////////////////////////////////////////////////////////////
-#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE "Boost Bloom Filter" 1
#include <iostream>
@@ -86,9 +85,9 @@
BoostHash<size_t, 6>,
BoostHash<size_t, 7>>> bloom_7;
- BOOST_CHECK_EQUAL(bloom_3.num_hash_functions(), 3);
- BOOST_CHECK_EQUAL(bloom_2.num_hash_functions(), 2);
- BOOST_CHECK_EQUAL(bloom_7.num_hash_functions(), 7);
+ BOOST_CHECK_EQUAL(bloom_3.num_hash_functions(), 3ul);
+ BOOST_CHECK_EQUAL(bloom_2.num_hash_functions(), 2ul);
+ BOOST_CHECK_EQUAL(bloom_7.num_hash_functions(), 7ul);
}
BOOST_AUTO_TEST_CASE(falsePositiveRate) {
@@ -124,8 +123,8 @@
bloom.insert(1);
BOOST_CHECK_EQUAL(bloom.contains(1), true);
- BOOST_CHECK_LE(bloom.count(), 3);
- BOOST_CHECK_GE(bloom.count(), 1);
+ BOOST_CHECK_LE(bloom.count(), 3ul);
+ BOOST_CHECK_GE(bloom.count(), 1ul);
}
BOOST_AUTO_TEST_CASE(doesNotContain) {
@@ -151,7 +150,7 @@
bloom.clear();
BOOST_CHECK_EQUAL(bloom.contains(1), false);
- BOOST_CHECK_EQUAL(bloom.count(), 0);
+ BOOST_CHECK_EQUAL(bloom.count(), 0ul);
}
BOOST_AUTO_TEST_CASE(testUnion) {
Deleted: sandbox/bloom_filter/trunk/libs/bloom_filter/test/makefile
==============================================================================
--- sandbox/bloom_filter/trunk/libs/bloom_filter/test/makefile 2011-06-02 17:46:24 EDT (Thu, 02 Jun 2011)
+++ (empty file)
@@ -1,27 +0,0 @@
-##############################################################################
-##
-## (C) Copyright Alejandro Cabrera 2011.
-## Distributed under the Boost
-## Software License, Version 1.0.
-## (See accompanying file LICENSE_1_0.txt or
-## copy at http://www.boost.org/LICENSE_1_0.txt)
-##
-## See http://www.boost.org/libs/bloom_filter for documentation.
-##
-##############################################################################
-CXXFLAGS := -Wall -Wextra -pedantic -std=c++0x -O3 -g
-LD_FLAGS := -lpthread -lboost_unit_test_framework
-INCLUDE_DIR := ../../../
-INC := ../../../boost/bloom_filter/bloom.hpp
-INCLUDES := -I$(INCLUDE_DIR)
-EXES := boost_test
-all : $(EXES)
-
-%.o : %.cpp $(INC)
- $(CXX) $(CXXFLAGS) -c $< $(INCLUDES)
-
-boost_test : boost_test.o murmurhash3.o
- $(CXX) $(CXXFLAGS) -o $@ $^ $(INCLUDES) $(LD_FLAGS)
-
-clean:
- rm -f *.o $(EXES)