From d7895a015de7561dfa900eb791b7b4cb37442121 Mon Sep 17 00:00:00 2001
From: Tomas Oberhuber <tomas.oberhuber@fjfi.cvut.cz>
Date: Tue, 24 Jun 2014 14:17:57 +0200
Subject: [PATCH] Fixing cpp unit dependency.
---
install | 6 +++---
tests/unit-tests/core/arrays/tnlMultiArrayTester.h | 3 ---
tests/unit-tests/core/vectors/tnlVectorOperationsTest.cu | 6 +++++-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/install b/install
index 410c572222..5f087e6dba 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 52c70ecbfd..488d90c5bd 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 0223a5a7c3..a4040aa7cc 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
+}
--
GitLab