Remove mktest branch (svn branch delete)

svn:revision:76150 svn:branch:mktest svn:account:starseeker
If we have CMAKE_EXECUTABLE_SUFFIX, try using it
2020-06-18 12:33:55 +00:00 · 2020-05-22 11:21:14 +00:00 · 2020-05-22 02:43:58 +00:00 · 2020-05-21 19:59:33 +00:00 · 2020-05-21 19:38:35 +00:00 · 2020-05-21 19:05:08 +00:00
1 changed files with 13 additions and 0 deletions
@@ -54,6 +54,8 @@ function(ensearch efile efound)
    "${CBD}/../bin"
    ../bench
    "${CBD}/../bench")
+
+  # First, check exactly what was specified
  foreach(sd ${sdirs})
    if(EXISTS ${sd}/${efile})
      set(${efound} "${sd}/${efile}" PARENT_SCOPE)
@@ -61,6 +63,17 @@ function(ensearch efile efound)
    endif(EXISTS ${sd}/${efile})
  endforeach(sd ${sdirs})

+  # If nothing was found and the platform defines an executable suffix, try
+  # with the suffix present as well.
+  if (CMAKE_EXECUTABLE_SUFFIX)
+    foreach(sd ${sdirs})
+      if(EXISTS ${sd}/${efile})
+	set(${efound} "${sd}/${efile}${CMAKE_EXECUTABLE_SUFFIX}" PARENT_SCOPE)
+	return()
+      endif(EXISTS ${sd}/${efile})
+    endforeach(sd ${sdirs})
+  endif (CMAKE_EXECUTABLE_SUFFIX)
+
  if(ENS_REQUIRED)
    message(FATAL_ERROR "Unable to find ${efile}, aborting")
  else(ENS_REQUIRED)
Author	SHA1	Message	Date
Clifford Yapp	29d4e9cbdd	Remove mktest branch (svn branch delete) svn:revision:76150 svn:branch:mktest svn:account:starseeker	2020-06-18 12:33:55 +00:00
Clifford Yapp	636ed3071e	If we have CMAKE_EXECUTABLE_SUFFIX, try using it svn:revision:75889 svn:branch:mktest svn:account:starseeker	2020-05-22 11:21:14 +00:00
Clifford Yapp	b54849fdc4	At least with that approach, fixtures doesn't reliably prepare all the necessary inputs (and a lot of build processes trying to build the same dependencies behind the various executables slows things down. svn:revision:75887 svn:branch:mktest svn:account:starseeker	2020-05-22 02:43:58 +00:00
Clifford Yapp	f603635ee2	See if we can just leverage the existing add_test override. Drawback is this will slow down the tests somewhat as the setup tests make sure things are built. Also, not sure if parallel setups will really behave as expected - need to test more thoroughly. svn:revision:75886 svn:branch:mktest svn:account:starseeker	2020-05-21 19:59:33 +00:00
Clifford Yapp	e240c504da	Make the fixture groups behind the scenes based on the executable name svn:revision:75885 svn:branch:mktest svn:account:starseeker	2020-05-21 19:38:35 +00:00
Clifford Yapp	4e9d783e87	Adapt the add_test wrapper as a BRLCAD_ADD_TEST function svn:revision:75883 svn:branch:mktest svn:account:starseeker	2020-05-21 19:05:08 +00:00
Clifford Yapp	bdaf9ce21b	First tentative experiments with the fixtures feature of CTest to provide tests run by make test with dependency resolution that results in their requirements being built prior to the running of the test. svn:revision:75882 svn:branch:mktest svn:account:starseeker	2020-05-21 18:00:35 +00:00
Clifford Yapp	8249d9e4cd	Make a branch to experiment with testing approaches - https://stackoverflow.com/a/56448477 indicates there is a new feature in CMake 3.7 which may be useful. svn:revision:75881 svn:branch:mktest svn:account:starseeker	2020-05-21 17:02:18 +00:00