Fix ch 14, r 3 for TC pass

1. Symlink where possible
2. Adjust collect_tests.py to execute dashboard.cmake
3. Use TARGET_FILE

chapter-14/recipe-03/cxx-example/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 # project name and language
 project(recipe-03 LANGUAGES CXX)
-
+                  
 # require C++11
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_EXTENSIONS OFF)

chapter-14/recipe-03/cxx-example/dashboard.cmake

@@ -1,5 +1,6 @@
 set(CTEST_PROJECT_NAME "example")
-set(CTEST_SITE "localhost")
+cmake_host_system_information(RESULT _site QUERY HOSTNAME)
+set(CTEST_SITE ${_site})
 set(CTEST_BUILD_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
 
 set(CTEST_SOURCE_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}")

chapter-14/recipe-03/cxx-example/src/CMakeLists.txt

@@ -1,15 +1,13 @@
 add_library(buggy "")
 
-target_sources(
-  buggy
+target_sources(buggy
   PRIVATE
     buggy.cpp
   PUBLIC
     ${CMAKE_CURRENT_LIST_DIR}/buggy.hpp
   )
 
-target_include_directories(
-  buggy
+target_include_directories(buggy
   PUBLIC
     ${CMAKE_CURRENT_LIST_DIR}
   )
@@ -18,13 +16,12 @@ option(ENABLE_ASAN "Enable AddressSanitizer" OFF)
 
 if(ENABLE_ASAN)
   if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
-    target_compile_options(
-      buggy
+    message(STATUS "AddressSanitizer enabled")
+    target_compile_options(buggy
       PUBLIC
         -g -O1 -fsanitize=address -fno-omit-frame-pointer
       )
-    target_link_libraries(
-      buggy
+    target_link_libraries(buggy
       PUBLIC
         asan
       )

chapter-14/recipe-03/cxx-example/tests/CMakeLists.txt

@@ -6,6 +6,6 @@ foreach(_test IN ITEMS leaky use_after_free)
     NAME
       ${_test}
     COMMAND
-      ${PROJECT_BINARY_DIR}/tests/${_test}
+      $<TARGET_FILE:${_test}>
     )
 endforeach()

chapter-14/recipe-03/fortran-example/CTestConfig.cmake

@@ -0,0 +1 @@
+../cxx-example/CTestConfig.cmake

chapter-14/recipe-03/fortran-example/dashboard.cmake

@@ -0,0 +1 @@
+../cxx-example/dashboard.cmake

chapter-14/recipe-03/fortran-example/src/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_library(buggy "")
 
-target_sources(
-  buggy
+target_sources(buggy
   PUBLIC
     ${CMAKE_CURRENT_LIST_DIR}/buggy.f90
   )
@@ -10,13 +9,12 @@ option(ENABLE_ASAN "Enable AddressSanitizer" OFF)
 
 if(ENABLE_ASAN)
   if(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
-    target_compile_options(
-      buggy
+    message(STATUS "AddressSanitizer enabled")
+    target_compile_options(buggy
       PUBLIC
         -g -fsanitize=address
       )
-    target_link_libraries(
-      buggy
+    target_link_libraries(buggy
       PUBLIC
         asan
       )

chapter-14/recipe-03/fortran-example/tests/CMakeLists.txt

@@ -5,5 +5,5 @@ add_test(
   NAME
     leaky
   COMMAND
-    ${PROJECT_BINARY_DIR}/tests/leaky
+    $<TARGET_FILE:leaky>
   )

testing/collect_tests.py

@@ -158,9 +158,7 @@ def run_example(topdir, generator, ci_environment, buildflags, recipe, example):
         return 0
 
     if skip:
-        sys.stdout.write(
-            '\nSKIPPING recipe (based on menu.yml)\n'
-        )
+        sys.stdout.write('\nSKIPPING recipe (based on menu.yml)\n')
         return 0
 
     return_code = 0
@@ -206,6 +204,17 @@ def run_example(topdir, generator, ci_environment, buildflags, recipe, example):
             return_code += run_command(
                 step=step, command=command, expect_failure=expect_failure)
 
+        # execute dashboard script, if it exists
+        dashboard_script = 'dashboard.cmake'
+        dashboard_script_path = cmakelists_path / dashboard_script
+        if dashboard_script_path.exists():
+            # if this directory contains a dashboard.cmake script, we launch it
+            step = dashboard_script
+            command = r'ctest -C {0} -S {1} -DCTEST_CMAKE_GENERATOR={2}'.format(
+                configuration, dashboard_script_path, generator)
+            return_code += run_command(
+                step=step, command=command, expect_failure=expect_failure)
+
     for entry in env:
         os.environ.pop(entry)