Changeset 1820e7 in git


Ignore:
Timestamp:
Apr 18, 2011, 8:26:33 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
845729b0cdf699d3eba18bc144ad8e14f46e1c99
Parents:
d39b74d650b0d8de034ccde6b59b71f5f0ffa2b2
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-18 20:26:33+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:17+01:00
Message:
ADD: more unit tests via CxxTest and related changes
FIX: NULLp for (void*)NULL + minor changes
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    rd39b74 r1820e7  
    9191stamp-h1
    9292stamp-h2
    93 libpolys/tests/simple_test
    94 libpolys/tests/simple_test_runner.cpp

  • libpolys/coeffs/Makefile.am

    rd39b74 r1820e7  
    3939
    4040## for testing...
    41 AM_LDFLAGS      = -L${top_builddir}/../coeffs -L${top_builddir}/../reporter -L${top_builddir}/../resources -L${top_builddir}/../../omalloc
     41AM_LDFLAGS      = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc -L${top_builddir}/../omalloc
    4242
    4343check_PROGRAMS = test test-g
    … …  
    4646test_g_SOURCES = test.cc
    4747
    48 test_LDADD   = libcoeffs.a -lresources -lreporter -lomalloc ${GMP_LIBS}
    49 test_g_LDADD = libcoeffs_g.a -lresources_g -lreporter_g -lomalloc_debug ${GMP_LIBS}
     48test_LDADD   = -lcoeffs ${GMP_LIBS} -lresources -lreporter -lmisc -lomalloc
     49test_g_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc_g -lomalloc_debug
    5050
    5151

  • libpolys/coeffs/test.cc

    rd39b74 r1820e7  
    11#include "config.h"
    2 
    32#include <misc/auxiliary.h>
     3#include <omalloc/omalloc.h>
     4
     5#include <reporter/reporter.h>
    46
    57#include <coeffs/coeffs.h>
    68#include <coeffs/numbers.h>
    7 #include <reporter/reporter.h>
    8 #include <omalloc/omalloc.h>
    99
    1010#include <coeffs/longrat.h>

  • libpolys/misc/auxiliary.h

    rd39b74 r1820e7  
    9999#ifndef NULL
    100100#define NULL        (0)
     101#endif
     102
     103#ifndef NULLp
     104#define NULLp        ((void*)NULL)
    101105#endif
    102106

  • libpolys/tests/Makefile.am

    rd39b74 r1820e7  
    22
    33## for testing...
    4 AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/../omalloc -lcoeffs_g -lresources_g -lreporter_g -lomalloc_debug ${GMP_LIBS}
     4AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc -L${top_builddir}/../omalloc
     5
    56
    67AM_CFLAGS = -g -Wextra -Wall -Wno-long-long ${PIPE}
    … …  
    1314INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} ${GMP_CFLAGS}
    1415
    15 TESTS = simple_test
     16TESTS = simple_test coeffs_test
    1617check_PROGRAMS = $(TESTS)
    1718
    1819simple_test_SOURCES = simple_test_runner.cpp
    1920
    20 BUILT_SOURCES = $(simple_test_SOURCES)
     21coeffs_test_SOURCES = coeffs_test_runner.cpp
     22
     23coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc -lomalloc_debug
     24
     25
     26BUILT_SOURCES = $(simple_test_SOURCES) $(coeffs_test_SOURCES)
     27
    2128
    2229# How to generate the test simple_test_runner
    … …  
    2431        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer $^
    2532
     33coeffs_test_runner.cpp: coeffs_test.h
     34        ${srcdir}/cxxtestgen.pl --no-eh -o $@ --error-printer $^

  • libpolys/tests/cxxtest/TestSuite.h

    rd39b74 r1820e7  
    329329    // TS_ASSERT_PREDICATE
    330330#   define ___ETS_ASSERT_PREDICATE(f,l,p,x,m) \
    331         CxxTest::doAssertPredicate( (f), (l), #p, p(), #x, (x), (m) )
     331        CxxTest::doAssertPredicate( (f), (l), #p, p, #x, (x), (m) )
    332332#   define ___TS_ASSERT_PREDICATE(f,l,p,x,m) \
    333333        { _TS_TRY { ___ETS_ASSERT_PREDICATE(f,l,p,x,m); } __TS_CATCH(f,l) }
Note: See TracChangeset for help on using the changeset viewer.