Changeset 44a76c in git for kernel

Timestamp:

Nov 23, 2011, 1:28:57 AM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

097c71a9e55bb76830c9f5b243182439619170a6

Parents:

a6e550e2a4d0c172e369eedbf17d1cce1e49ef2a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-23 01:28:57+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-23 01:56:36+01:00

Message:

static and dynamic tests for libkernel/

ADD: more test variants: static & dynamic in addition to debug & release (kernel)

CHG: minor cleanup (TODO: separate!!!)

File:

• kernel/Makefile.am (modified) (3 diffs)

kernel/Makefile.am

@@ -44 +44 @@
     eigenval.cc units.cc \
     fast_mult.cc digitech.cc \
-    tgb.cc tgbgauss.cc ringgb.cc f5data.cc f5lists.cc f5gb.cc \
-    f5c.cc ratgring.cc shiftgb.cc gfan.cc \
+    tgb.cc tgbgauss.cc ringgb.cc f5data.cc f5lists.cc f5gb.cc f5c.cc \
+    ratgring.cc shiftgb.cc gfan.cc \
     linearAlgebra.cc nc.cc preimage.cc \
     fegetopt.c mod2.h 
@@ -69 +69 @@
         preimage.h longrat.h timer.h kInline.h modulop.h fast_mult.h \
         digitech.h tgb.h ringgb.h tgbgauss.h tgb_internal.h \
-        linearAlgebra.h page.h
+        linearAlgebra.h page.h \
+        f5c.h f5data.h f5gb.h f5lists.h
 
 libkernel_includedir  =${includedir}/singular/kernel/
@@ -86 +87 @@
 TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}' 
 
-TESTS = testg testr 
+TESTS = test-s-g test-s-r test-d-g test-d-r 
 check_PROGRAMS = $(TESTS)
 
-testr_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
-testg_CFLAGS = ${PIPE}
+test_s_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
+test_s_g_CFLAGS = ${PIPE}
 
-testr_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-testg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
+test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
+test_s_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
 
-testsources = test.cc f5c.h f5data.h f5gb.h f5lists.h
-testr_SOURCES = $(testsources)
-testg_SOURCES = $(testsources)
+testsources = test.cc
+test_s_r_SOURCES = $(testsources)
+test_s_g_SOURCES = $(testsources)
 
-testr_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
-testg_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
+test_s_r_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
+test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
 
-testr_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
-#testg_CPPFLAGS = 
+test_s_r_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
+#test_s_g_CPPFLAGS = 
+
+test_s_r_LDFLAGS = -static
+test_s_g_LDFLAGS = -static
+
+
+test_d_r_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
+test_d_g_CFLAGS = ${PIPE}
+
+test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
+test_d_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
+
+test_d_r_SOURCES = $(testsources)
+test_d_g_SOURCES = $(testsources)
+
+test_d_r_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
+test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
+
+test_d_r_CPPFLAGS = -DNDEBUG -DOM_NDEBUG
+#test_d_g_CPPFLAGS = 
+
 
 CLEANFILES = $(TESTS)