diff --git a/install b/install index 410c5722222e1a140541f8a7c6c220f7de2a989c..5f087e6dba16087e5cabdabdc6d0a5ee164d719e 100755 --- a/install +++ b/install @@ -33,7 +33,7 @@ ${CMAKE} .. -DCMAKE_BUILD_TYPE=Debug \ -DPETSC_DIR=${PETSC_DIR} \ -DWITH_TEMPLATE_EXPLICIT_INSTANTIATION=${TEMPLATE_EXPLICIT_INSTANTIATION} make -j${CPUS} ${VERBOSE} -make -j${CPUS} test +#make -j${CPUS} test make -j${CPUS} install cd ../Release @@ -43,7 +43,7 @@ ${CMAKE} .. -DCMAKE_INSTALL_PREFIX=${HOME}/local \ -DWITH_CUSPARSE=${WITH_CUSPARSE} \ -DPETSC_DIR=${PETSC_DIR} \ -DWITH_TEMPLATE_EXPLICIT_INSTANTIATION=${TEMPLATE_EXPLICIT_INSTANTIATION} -#make -j${CPUS} ${VERBOSE} +make -j${CPUS} ${VERBOSE} #make -j${CPUS} test -#make -j${CPUS} install +make -j${CPUS} install diff --git a/tests/unit-tests/core/arrays/tnlMultiArrayTester.h b/tests/unit-tests/core/arrays/tnlMultiArrayTester.h index 52c70ecbfd0ff8141d72a9a565aa8d3ca3162510..488d90c5bd63176e967d919e66cef7e5ed6dc7ee 100644 --- a/tests/unit-tests/core/arrays/tnlMultiArrayTester.h +++ b/tests/unit-tests/core/arrays/tnlMultiArrayTester.h @@ -250,9 +250,6 @@ class tnlMultiArrayTester : public CppUnit :: TestCase }; -#else /* HAVE_CPPUNIT */ -template< int, Dimensions, typename ElementType, typename Device, typename IndexType > -class tnlMultiArrayTester{}; #endif /* HAVE_CPPUNIT */ diff --git a/tests/unit-tests/core/vectors/tnlVectorOperationsTest.cu b/tests/unit-tests/core/vectors/tnlVectorOperationsTest.cu index 0223a5a7c3a8d49c7d6b3d85991bb44610043c82..a4040aa7cc1fa277478989b9c5a0d02236020d55 100644 --- a/tests/unit-tests/core/vectors/tnlVectorOperationsTest.cu +++ b/tests/unit-tests/core/vectors/tnlVectorOperationsTest.cu @@ -20,7 +20,11 @@ int main( int argc, char* argv[] ) { +#ifdef HAVE_CPPUNIT if( ! tnlUnitTestStarter :: run< tnlVectorOperationsTester< double, tnlCuda > >() ) return EXIT_FAILURE; return EXIT_SUCCESS; -} \ No newline at end of file +#else + return EXIT_FAILURE; +#endif +}