[cig-commits] commit 2046 by bangerth to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 2046

Move back. Modify run_testsuite to find the correct directory.

A   trunk/aspect/CTestConfig.cmake
D   trunk/aspect/tests/CTestConfig.cmake
U   trunk/aspect/tests/run_testsuite.cmake


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2046&peg=2046

Diff:
Copied: trunk/aspect/CTestConfig.cmake (from rev 2045, trunk/aspect/tests/CTestConfig.cmake)
===================================================================
--- trunk/aspect/CTestConfig.cmake	                        (rev 0)
+++ trunk/aspect/CTestConfig.cmake	2013-11-25 00:55:30 UTC (rev 2046)
@@ -0,0 +1,54 @@
+## ---------------------------------------------------------------------
+## $Id$
+##
+## Copyright (C) 2013 by the authors of the ASPECT code.
+##
+##  This file is part of ASPECT.
+##
+##  ASPECT is free software; you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation; either version 2, or (at your option)
+##  any later version.
+##
+##  ASPECT is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with ASPECT; see the file doc/COPYING.  If not see
+##  <http://www.gnu.org/licenses/>.
+##
+## ---------------------------------------------------------------------
+
+#
+# Dashboard configuration:
+#
+
+SET(CTEST_PROJECT_NAME "aspect")
+
+SET(CTEST_DROP_METHOD "http")
+SET(CTEST_DROP_SITE "cdash.kyomu.43-1.org")
+SET(CTEST_DROP_LOCATION "/submit.php?project=aspect")
+SET(CTEST_DROP_SITE_CDASH TRUE)
+
+SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS   100)
+SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 300)
+
+# number of lines to submit before an error:
+SET(CTEST_CUSTOM_ERROR_PRE_CONTEXT            5)
+# number of lines to submit after an error:
+SET(CTEST_CUSTOM_ERROR_POST_CONTEXT          20)
+
+#
+# Coverage options:
+#
+
+SET(CTEST_EXTRA_COVERAGE_GLOB
+  # These files should have executable lines and therefore coverage:
+  # source/**/*.cc
+  )
+
+SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
+  "/tests/"
+  )

Modified: trunk/aspect/tests/run_testsuite.cmake
===================================================================
--- trunk/aspect/tests/run_testsuite.cmake	2013-11-25 00:37:16 UTC (rev 2045)
+++ trunk/aspect/tests/run_testsuite.cmake	2013-11-25 00:55:30 UTC (rev 2046)
@@ -132,6 +132,13 @@
   #
   SET(CTEST_SOURCE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
 
+  # The code above set the source directory of that of the run_testsuite.cmake
+  # script, but we need the directory of aspect, which is simply one level
+  # higher
+  IF ("${CTEST_SOURCE_DIRECTORY}" MATCHES "/tests")
+    SET(CTEST_SOURCE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../)
+  ENDIF()
+
   IF(NOT EXISTS ${CTEST_SOURCE_DIRECTORY}/CMakeLists.txt)
     MESSAGE(FATAL_ERROR "
 Could not find a suitable source directory. Please, set
@@ -501,4 +508,3 @@
 </Update>"
     )
 ENDIF()
-