Changeset 942


Ignore:
Timestamp:
Sep 10, 2011, 4:55:51 PM (8 years ago)
Author:
sam
Message:

test: reorganise test suite and benchmark code.

Location:
trunk
Files:
6 added
1 deleted
2 edited
5 moved

Legend:

Unmodified
Added
Removed
  • trunk/.gitignore

    r893 r942  
    5454deushax/editor
    5555monsterz/monsterz
    56 test/lol-test
    57 test/lol-bench
     56test/testsuite
     57test/benchsuite
    5858test/quad
    5959test/sandbox
  • trunk/test/Makefile.am

    r941 r942  
    22AM_CPPFLAGS = -I$(top_srcdir)/src
    33
    4 bench: lol-bench$(EXEEXT)
    5         ./lol-bench$(EXEEXT)
     4bench: benchsuite$(EXEEXT)
     5        ./benchsuite$(EXEEXT)
    66
    7 all-local: quad$(EXEEXT) lol-bench$(EXEEXT)
     7all-local: quad$(EXEEXT) benchsuite$(EXEEXT)
    88        test x$(MAKE_FSELF) = xno || make_fself quad$(EXEEXT) quad.self
    99        test x$(MAKE_FSELF) = xno || make_fself sandbox$(EXEEXT) sandbox.self
    10         test x$(MAKE_FSELF) = xno || make_fself lol-bench$(EXEEXT) lol-bench.self
    11         test x$(MAKE_FSELF) = xno || make_fself lol-test$(EXEEXT) lol-test.self
     10        test x$(MAKE_FSELF) = xno || make_fself benchsuite$(EXEEXT) benchsuite.self
     11        test x$(MAKE_FSELF) = xno || make_fself testsuite$(EXEEXT) testsuite.self
    1212
    13 CLEANFILES = quad.self sandbox lol-bench.self lol-test.self
     13CLEANFILES = $(noinst_PROGRAMS:%=%.self) $(noinst_PROGRAMS:%=%.exe)
     14#quad.self sandbox.self benchsuite.self testsuite.self \
     15#             quad.exe sandbox.exe benchsuite.exe testsuite.exe
    1416
    15 noinst_PROGRAMS = quad sandbox lol-bench lol-test
     17noinst_PROGRAMS = quad sandbox benchsuite testsuite
    1618
    17 TESTS = lol-test
     19TESTS = testsuite
    1820
    19 lol_test_SOURCES = lol-test.cpp matrix.cpp half.cpp trig.cpp build.cpp
    20 lol_test_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    21 lol_test_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
    22 lol_test_DEPENDENCIES = $(top_builddir)/src/liblol.a
     21testsuite_SOURCES = testsuite.cpp \
     22    unit/matrix.cpp unit/half.cpp unit/trig.cpp unit/build.cpp
     23testsuite_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
     24testsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     25testsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a
    2326
    24 lol_bench_SOURCES = lol-bench.cpp
    25 lol_bench_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    26 lol_bench_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
    27 lol_bench_DEPENDENCIES = $(top_builddir)/src/liblol.a
     27benchsuite_SOURCES = benchsuite.cpp \
     28    benchmark/matrix.cpp benchmark/half.cpp benchmark/trig.cpp
     29benchsuite_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
     30benchsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
     31benchsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a
    2832
    2933quad_SOURCES = debug/quad.cpp
Note: See TracChangeset for help on using the changeset viewer.