Changeset 942 for trunkTweet

Timestamp:

Sep 10, 2011, 4:55:51 PM (11 years ago)

Author:

sam

Message:

test: reorganise test suite and benchmark code.

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/benchmark (added)
• test/benchmark/half.cpp (added)
• test/benchmark/matrix.cpp (added)
• test/benchmark/trig.cpp (added)
• test/benchsuite.cpp (added)
• test/lol-bench.cpp (deleted)
• test/testsuite.cpp (moved) (moved from trunk/test/lol-test.cpp)
• test/unit (added)
• test/unit/build.cpp (moved) (moved from trunk/test/build.cpp)
• test/unit/half.cpp (moved) (moved from trunk/test/half.cpp)
• test/unit/matrix.cpp (moved) (moved from trunk/test/matrix.cpp)
• test/unit/trig.cpp (moved) (moved from trunk/test/trig.cpp)

trunk/.gitignore

@@ -54 +54 @@
 deushax/editor
 monsterz/monsterz
-test/lol-test
-test/lol-bench
+test/testsuite
+test/benchsuite
 test/quad
 test/sandbox

trunk/test/Makefile.am

@@ -2 +2 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-bench: lol-bench$(EXEEXT)
-        ./lol-bench$(EXEEXT)
+bench: benchsuite$(EXEEXT)
+        ./benchsuite$(EXEEXT)
 
-all-local: quad$(EXEEXT) lol-bench$(EXEEXT)
+all-local: quad$(EXEEXT) benchsuite$(EXEEXT)
         test x$(MAKE_FSELF) = xno || make_fself quad$(EXEEXT) quad.self
         test x$(MAKE_FSELF) = xno || make_fself sandbox$(EXEEXT) sandbox.self
-        test x$(MAKE_FSELF) = xno || make_fself lol-bench$(EXEEXT) lol-bench.self
-        test x$(MAKE_FSELF) = xno || make_fself lol-test$(EXEEXT) lol-test.self
+        test x$(MAKE_FSELF) = xno || make_fself benchsuite$(EXEEXT) benchsuite.self
+        test x$(MAKE_FSELF) = xno || make_fself testsuite$(EXEEXT) testsuite.self
 
-CLEANFILES = quad.self sandbox lol-bench.self lol-test.self
+CLEANFILES = $(noinst_PROGRAMS:%=%.self) $(noinst_PROGRAMS:%=%.exe)
+#quad.self sandbox.self benchsuite.self testsuite.self \
+#             quad.exe sandbox.exe benchsuite.exe testsuite.exe
 
-noinst_PROGRAMS = quad sandbox lol-bench lol-test
+noinst_PROGRAMS = quad sandbox benchsuite testsuite
 
-TESTS = lol-test
+TESTS = testsuite
 
-lol_test_SOURCES = lol-test.cpp matrix.cpp half.cpp trig.cpp build.cpp
-lol_test_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-lol_test_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
-lol_test_DEPENDENCIES = $(top_builddir)/src/liblol.a
+testsuite_SOURCES = testsuite.cpp \
+    unit/matrix.cpp unit/half.cpp unit/trig.cpp unit/build.cpp
+testsuite_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
+testsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+testsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
-lol_bench_SOURCES = lol-bench.cpp
-lol_bench_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-lol_bench_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
-lol_bench_DEPENDENCIES = $(top_builddir)/src/liblol.a
+benchsuite_SOURCES = benchsuite.cpp \
+    benchmark/matrix.cpp benchmark/half.cpp benchmark/trig.cpp
+benchsuite_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
+benchsuite_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+benchsuite_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 quad_SOURCES = debug/quad.cpp