Changeset 512f05 in git

Timestamp:

Jul 13, 2010, 11:13:47 PM (13 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

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:

• Makefile.in (modified) (1 diff)
• tests/CMakeLists.txt (modified) (1 diff)
• tests/Singular/CMakeLists.txt (modified) (2 diffs)
• tests/Suite.hpp (moved) (moved from tests/Singular/Suite.hpp)
• tests/main.cpp (modified) (1 diff)

Makefile.in

@@ -173 +173 @@
 ##############################################################
 test:
+        @echo "make Tst for the official Singular test suite"
+        @echo "this part here are unittest and still under development"
+        (cd Singular; make libsingular.a)
         mkdir -p build
         (cd build && cmake .. && make && make test)

tests/CMakeLists.txt

@@ -2 +2 @@
 #
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${${PROJECT_NAME}_SOURCE_DIR})
+include_directories(${${PROJECT_NAME}_SOURCE_DIR}/kernel)
+include_directories(${${PROJECT_NAME}_SOURCE_DIR}/factory)
+
+# include directories should be solved
+#include_directories(${${PROJECT_NAME}_SOURCE_DIR}/Singular)
+include_directories(${${PROJECT_NAME}_SOURCE_DIR}/omalloc)
+
+
 add_subdirectory(Singular)
 add_subdirectory(kernel)
+
+set(test_srcs main.cpp
+#       Singleton.cpp
+  )
+
+add_executable(Singular_test_suite ${test_srcs})
+target_link_libraries(Singular_test_suite Singular-test)
+target_link_libraries(Singular_test_suite ${${PROJECT_NAME}_SOURCE_DIR}/omalloc/libomalloc.a)
+
+#target_link_libraries(Singular_test_suite Singular-test)
+
+# adding the tests
+add_test(Singular_test_suite ${CMAKE_CURRENT_BINARY_DIR}/Singular_test_suite)
+

tests/Singular/CMakeLists.txt

@@ -25 +25 @@
 target_link_libraries(Singular-test
   cppunit
-  singular.a
+  ${${PROJECT_NAME}_SOURCE_DIR}/Singular/libsingular.a
   ${${PROJECT_NAME}_SOURCE_DIR}/Singular/libsingular-tesths.o
   gmp readline
@@ -31 +31 @@
   )
 
-add_executable(Singular_test_suite ${CMAKE_CURRENT_SOURCE_DIR}/../main.cpp)
-target_link_libraries(Singular_test_suite Singular-test)
+#add_executable(Singular_test_suite ${CMAKE_CURRENT_SOURCE_DIR}/../main.cpp)
+#target_link_libraries(Singular_test_suite Singular-test)
 
 # adding the tests
-add_test(Singular_test_suite ${CMAKE_CURRENT_BINARY_DIR}/Singular_test_suite)
+#add_test(Singular_test_suite ${CMAKE_CURRENT_BINARY_DIR}/Singular_test_suite)

tests/main.cpp

@@ -42 +42 @@
 #include <cppunit/Message.h>
 
-#include <tests/Singular/Suite.hpp>
+#include <tests/Suite.hpp>
 
 int main(int /* argc */, char ** /*argv*/)