Changeset 512f05 in git


Ignore:
Timestamp:
Jul 13, 2010, 11:13:47 PM (14 years ago)
Author:
Kai Krüger <krueger@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
Children:
ee3e5aad8488b9b2dfc02b906e2dc59da7ace9ab
Parents:
38f32ddce752741e2f973ef6d6a2221da17781fc
Message:
Should fix Ticket #243

git-svn-id: file:///usr/local/Singular/svn/trunk@13000 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • Makefile.in

    r38f32d r512f05  
    173173##############################################################
    174174test:
     175        @echo "make Tst for the official Singular test suite"
     176        @echo "this part here are unittest and still under development"
     177        (cd Singular; make libsingular.a)
    175178        mkdir -p build
    176179        (cd build && cmake .. && make && make test)
  • tests/CMakeLists.txt

    r38f32d r512f05  
    22#
    33
     4include_directories(${CMAKE_CURRENT_SOURCE_DIR})
     5include_directories(${${PROJECT_NAME}_SOURCE_DIR})
     6include_directories(${${PROJECT_NAME}_SOURCE_DIR}/kernel)
     7include_directories(${${PROJECT_NAME}_SOURCE_DIR}/factory)
     8
     9# include directories should be solved
     10#include_directories(${${PROJECT_NAME}_SOURCE_DIR}/Singular)
     11include_directories(${${PROJECT_NAME}_SOURCE_DIR}/omalloc)
     12
     13
    414add_subdirectory(Singular)
    515add_subdirectory(kernel)
     16
     17set(test_srcs main.cpp
     18#       Singleton.cpp
     19  )
     20
     21add_executable(Singular_test_suite ${test_srcs})
     22target_link_libraries(Singular_test_suite Singular-test)
     23target_link_libraries(Singular_test_suite ${${PROJECT_NAME}_SOURCE_DIR}/omalloc/libomalloc.a)
     24
     25#target_link_libraries(Singular_test_suite Singular-test)
     26
     27# adding the tests
     28add_test(Singular_test_suite ${CMAKE_CURRENT_BINARY_DIR}/Singular_test_suite)
     29
  • tests/Singular/CMakeLists.txt

    r38f32d r512f05  
    2525target_link_libraries(Singular-test
    2626  cppunit
    27   singular.a
     27  ${${PROJECT_NAME}_SOURCE_DIR}/Singular/libsingular.a
    2828  ${${PROJECT_NAME}_SOURCE_DIR}/Singular/libsingular-tesths.o
    2929  gmp readline
     
    3131  )
    3232
    33 add_executable(Singular_test_suite ${CMAKE_CURRENT_SOURCE_DIR}/../main.cpp)
    34 target_link_libraries(Singular_test_suite Singular-test)
     33#add_executable(Singular_test_suite ${CMAKE_CURRENT_SOURCE_DIR}/../main.cpp)
     34#target_link_libraries(Singular_test_suite Singular-test)
    3535
    3636# adding the tests
    37 add_test(Singular_test_suite ${CMAKE_CURRENT_BINARY_DIR}/Singular_test_suite)
     37#add_test(Singular_test_suite ${CMAKE_CURRENT_BINARY_DIR}/Singular_test_suite)
  • tests/main.cpp

    r38f32d r512f05  
    4242#include <cppunit/Message.h>
    4343
    44 #include <tests/Singular/Suite.hpp>
     44#include <tests/Suite.hpp>
    4545
    4646int main(int /* argc */, char ** /*argv*/)
Note: See TracChangeset for help on using the changeset viewer.