diff --git a/dune/common/test/CMakeLists.txt b/dune/common/test/CMakeLists.txt index 5fb1f6c5b59c2d389e35008bf05b062b7cede9b7..a1120ebc3b4b8e4481f200f42158af9db87e1f7f 100644 --- a/dune/common/test/CMakeLists.txt +++ b/dune/common/test/CMakeLists.txt @@ -29,7 +29,6 @@ set(TESTS shared_ptrtest_config singletontest streamtest - testfconstruct testfloatcmp tuplestest_config tupleutilitytest @@ -48,9 +47,7 @@ set(COMPILEFAILTESTS check_fvector_size_fail1 check_fvector_size_fail2 genericiterator_compile_fail - nullptr-test-fail - testfconstruct_fail1 - testfconstruct_fail2) + nullptr-test-fail) set(TESTPROGS ${TESTS} ${FAILTESTS}) @@ -161,15 +158,6 @@ add_executable("testdebugallocator_fail5" testdebugallocator.cc) target_link_libraries(testdebugallocator_fail5 dunecommon) set_target_properties(testdebugallocator_fail5 PROPERTIES COMPILE_DEFINITIONS "FAILURE5;EXPECTED_SIGNAL=SIGSEGV") -add_executable("testfconstruct" EXCLUDE_FROM_ALL testfconstruct.cc) -set_target_properties(testfconstruct PROPERTIES COMPILE_FLAGS "-DFVSIZE=3") -target_link_libraries(testfconstruct "dunecommon") -add_executable("testfconstruct_fail1" EXCLUDE_FROM_ALL testfconstruct.cc) -set_target_properties(testfconstruct_fail1 PROPERTIES COMPILE_FLAGS "-DFVSIZE=2") -target_link_libraries(testfconstruct_fail1 "dunecommon") -add_executable("testfconstruct_fail2" EXCLUDE_FROM_ALL testfconstruct.cc) -set_target_properties(testfconstruct_fail2 PROPERTIES COMPILE_FLAGS "-DFVSIZE=5") -target_link_libraries(testfconstruct_fail2 "dunecommon") add_executable("tuplestest_config" tuplestest.cc) add_executable("tupleutilitytest" tupleutilitytest.cc) add_executable("utilitytest" utilitytest.cc) diff --git a/dune/common/test/Makefile.am b/dune/common/test/Makefile.am index 19bffaaea62ee3709a0b46cd21e695ccfdf1de09..fe06436d730b013c8e75028742954794fb1431c4 100644 --- a/dune/common/test/Makefile.am +++ b/dune/common/test/Makefile.am @@ -36,7 +36,6 @@ TESTPROGS = \ testdebugallocator_fail3 \ testdebugallocator_fail4 \ testdebugallocator_fail5 \ - testfconstruct \ testfloatcmp \ tuplestest_std \ tupleutilitytest \ @@ -50,9 +49,7 @@ COMPILE_XFAIL_TESTS = \ check_fvector_size_fail1 \ check_fvector_size_fail2 \ genericiterator_compile_fail \ - nullptr-test-fail \ - testfconstruct_fail1 \ - testfconstruct_fail2 + nullptr-test-fail compile_XFAIL: for i in $(COMPILE_XFAIL_TESTS); do \ @@ -192,15 +189,6 @@ testdebugallocator_fail4_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE4 -DDEBUG_ALLOCATOR_ testdebugallocator_fail5_SOURCES = testdebugallocator.cc testdebugallocator_fail5_CPPFLAGS = $(AM_CPPFLAGS) -DFAILURE5 -testfconstruct_SOURCES = testfconstruct.cc -testfconstruct_CPPFLAGS = $(AM_CPPFLAGS) -DFVSIZE=3 - -testfconstruct_fail1_SOURCES = testfconstruct.cc -testfconstruct_fail1_CPPFLAGS = $(AM_CPPFLAGS) -DFVSIZE=2 - -testfconstruct_fail2_SOURCES = testfconstruct.cc -testfconstruct_fail2_CPPFLAGS = $(AM_CPPFLAGS) -DFVSIZE=5 - testfloatcmp_SOURCES = testfloatcmp.cc tuplestest_std_SOURCES = tuplestest.cc diff --git a/dune/common/test/testfconstruct.cc b/dune/common/test/testfconstruct.cc deleted file mode 100644 index a35feafd6dcc80413138401564fd99d842114387..0000000000000000000000000000000000000000 --- a/dune/common/test/testfconstruct.cc +++ /dev/null @@ -1,17 +0,0 @@ -// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -// vi: set et ts=4 sw=2 sts=2: -#include <config.h> - -#include <iostream> -#include <dune/common/fvector.hh> -#include <dune/common/fassign.hh> - -using namespace Dune; - -int main(int, char**) { - Dune::FieldVector<double,3> pos; - - pos <<= 1, 0, 0; - - Dune::FieldVector<float,FVSIZE> pos2(pos); -}