Commit 81e11443 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

added labels for modules and app vs unit tests

parent 0ffef397

isis/cmake/AddIsisModule.cmake

+7 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ function(make_obj_unit_test moduleName testFile truthFile reqLibs pluginLibs) 
  endforeach()



  # Generate a name for the executable

  set(executableName "${moduleName}_unit_test_${filename}")

  set(executableName "unitTest_${filename}")



  # Create the executable and link it to the module library

  add_executable( ${executableName} ${testFile})
@@ -87,7 +87,7 @@ function(make_obj_unit_test moduleName testFile truthFile reqLibs pluginLibs) 
  target_link_libraries(${executableName} ${moduleName} ${depLibs})



  # Call function to add the test

  add_unit_test_target(${executableName} ${truthFile})

  add_unit_test_target(${executableName} ${truthFile} ${moduleName})



endfunction(make_obj_unit_test)
@@ -271,7 +271,11 @@ function(add_isis_module name) 
      foreach(val RANGE ${numTests})

        list(GET unitTestFiles ${val} testFile )

        list(GET truthFiles    ${val} truthFile)

        if(name STREQUAL "isis3")

          make_obj_unit_test("core" ${testFile} ${truthFile} "${reqLibs}" "${pluginLibs}")

        else()

          make_obj_unit_test(${name} ${testFile} ${truthFile} "${reqLibs}" "${pluginLibs}")

        endif()

      endforeach()

    endif()

isis/cmake/TestSetup.cmake

+2 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ endmacro() 




# Add a class based unit test with an executable and a truth file.

macro(add_unit_test_target testFile truthFile)

macro(add_unit_test_target testFile truthFile labels)



  set(thisFolder "${PROJECT_SOURCE_DIR}/cmake")

  set(fullTestPath "${CMAKE_BINARY_DIR}/unitTest/${testFile}") # The binary that the script will execute
@@ -79,6 +79,5 @@ macro(add_unit_test_target testFile truthFile) 
           -DDATA_ROOT=$ENV{ISIS3DATA}

           -DCODE_ROOT=${PROJECT_SOURCE_DIR}

           -P ${thisFolder}/RunUnitTest.cmake)



  set_tests_properties(${testName} PROPERTIES LABELS "unit")

  set_tests_properties(${testName} PROPERTIES LABELS "unit;${labels}")

endmacro()