[Kst] branches/work/kst/hierarchy/kst/tests

[Eli Fidler]

SVN commit 610810 by fidler:

merge trunk changes 604960:609664 into hierarchy branch


 M  +7 -2      Makefile.am  
 M  +1 -1      kstXbench/tw.cpp  
 A             testamatrix.cpp   trunk/extragear/graphics/kst/tests/testamatrix.cpp#609726
 A             testcsd.cpp   trunk/extragear/graphics/kst/tests/testcsd.cpp#609726
 A             testmatrix.cpp   trunk/extragear/graphics/kst/tests/testmatrix.cpp#609726
 A             testpsd.cpp   trunk/extragear/graphics/kst/tests/testpsd.cpp#609726
 A             testsmatrix.cpp   trunk/extragear/graphics/kst/tests/testsmatrix.cpp#609726


--- branches/work/kst/hierarchy/kst/tests/Makefile.am #610809:610810
@@ -6,7 +6,8 @@
 SUBDIRS=. kstXbench $(HEALPIX_DIR)
 
 check_PROGRAMS=testeqparser testhistogram testscalars testlabelparser \
-		testvector testrvector
+		testvector testrvector \
+		testmatrix testamatrix testcsd testpsd testsmatrix
 
 METASOURCES=AUTO
 
@@ -20,4 +21,8 @@
 testlabelparser_SOURCES=testlabelparser.cpp
 testvector_SOURCES=testvector.cpp
 testrvector_SOURCES=testrvector.cpp
-
+testmatrix_SOURCES=testmatrix.cpp
+testamatrix_SOURCES=testamatrix.cpp
+testcsd_SOURCES=testcsd.cpp
+testpsd_SOURCES=testpsd.cpp
+testsmatrix_SOURCES=testsmatrix.cpp
--- branches/work/kst/hierarchy/kst/tests/kstXbench/tw.cpp #610809:610810
@@ -189,4 +189,4 @@
           WIDTH,  HEIGHT, 1000.0*double( j )/double( et ) );
 }
 
-#include "tw.moc"
+//#include "tw.moc"