Skip to content

Commit

Permalink
Merge pull request #766 from tjhei/insource_tests
Browse files Browse the repository at this point in the history
Repair ins-ource builds
  • Loading branch information
bangerth committed Feb 22, 2016
2 parents 850637c + 7eff648 commit e768257
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Expand Up @@ -9,6 +9,7 @@
/AspectConfig.cmake
/CMakeLists.txt.user*
/CTestTestfile.cmake
/Makefile
/aspect
/benchmark/**/CMakeCache.txt
/benchmark/**/CMakeFiles/
Expand Down Expand Up @@ -44,3 +45,7 @@
/tests/CTestTestfile.cmake
/tests/Makefile
/tests/cmake_install.cmake
/tests/output-*/
/tests/*.x.prm
/tests/lib*.so
/Testing
5 changes: 5 additions & 0 deletions tests/CMakeLists.txt
Expand Up @@ -122,6 +122,11 @@ FOREACH(_test ${_tests})
MESSAGE("Ignoring invalid .prm '${_test_full}'...")
CONTINUE()
ENDIF()
IF (${_test_full} MATCHES "\\.x\\.prm$")
# Skip files generated by in source builds:
CONTINUE()
ENDIF()

SET(_use_test ON)
SHOULD_ENABLE_TEST(${CMAKE_CURRENT_SOURCE_DIR}/${_test}.prm)

Expand Down

0 comments on commit e768257

Please sign in to comment.