Commit 9782b4dd authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

various fixes to get testing up and running

parent 7733379a

isis/cmake/AddIsisModule.cmake

+9 −4
Original line number Diff line number Diff line
@@ -82,6 +82,13 @@ function(make_obj_unit_test moduleName testFile truthFile reqLibs pluginLibs) 
  # Generate a name for the executable

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



  # check for the existance of a unitTest.xml as they need

  # to be copies over to somehwere the unitTest can access.

  set(test_xml "${folder}/unitTest.xml")

  if(EXISTS "${test_xml}")

    configure_file("${test_xml}" "${CMAKE_BINARY_DIR}/unitTest/${executableName}.xml" COPYONLY)

  endif()



  # Create the executable and link it to the module library

  add_executable( ${executableName} ${testFile})

  set(depLibs "${reqLibs};${matchedLibs}")
@@ -93,8 +100,6 @@ function(make_obj_unit_test moduleName testFile truthFile reqLibs pluginLibs) 
endfunction(make_obj_unit_test)









# Incorporate a single obj folder

function(add_isis_obj folder reqLibs)

isis/cmake/FindAllDependencies.cmake

+0 −3
Original line number Diff line number Diff line
@@ -189,9 +189,6 @@ list(REMOVE_DUPLICATES ALLLIBDIRS) 
list(REMOVE_DUPLICATES ALLLIBS)

list(REMOVE_DUPLICATES ALLINCDIRS)



message(${ALLLIBS})

message(${ALLLIBDIRS})



# message(STATUS "ALL LIBS DIRS: ${ALLLIBDIRS}")

# message(STATUS "ALL LIBS: ${ALLLIBS}")

# message(STATUS "ALL INCS: ${ALLINCDIRS}")

isis/cmake/RunUnitTest.cmake

+5 −4
Original line number Diff line number Diff line
@@ -50,13 +50,14 @@ set(comp1 ${outputFile}) 
set(comp2 ${TRUTH_FILE})

set(exclusionPath ${truthFolder}/unitTest.exclude)

if(EXISTS ${exclusionPath})

  message("Using Exlusion file ${exclusionPath}")

  set(comp1 ${tempDir}/output_exclude.txt)

  set(comp2 ${tempDir}/truth_exclude.txt)

  # This throws out all lines containing a word from the exclusion file.

  execute_process(COMMAND cat ${outputFile} | grep -v -f ${exclusionPath}

                  OUTPUT_FILE ${comp1})

  execute_process(COMMAND cat ${TRUTH_FILE} | grep -v -f ${exclusionPath}

                  OUTPUT_FILE ${comp2})

  execute_process(COMMAND "cat ${outputFile} | grep -v -f ${exclusionPath}"

                  OUTPUT_FILE "${comp1}")

  execute_process(COMMAND "cat ${TRUTH_FILE} | grep -v -f ${exclusionPath}"

                  OUTPUT_FILE "${comp2}")

endif()



# Verify that the files are exactly the same

isis/cmake/TestSetup.cmake

+0 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ function(add_makefile_test_folder folder prefix_name) 


    # Call lower level function to finish adding the test.

    add_makefile_test_target(${testName} ${makeFile} ${inputDir} ${outputDir} ${truthDir})



endfunction()
@@ -46,7 +45,6 @@ endfunction() 
macro(add_makefile_test_target testName makeFile inputDir outputDir truthDir)



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



  # Set up a cmake script which will execute the command in the makefile

  #  and then check the results against the truth folder.

  add_test(NAME ${testName}

isis/src/base/apps/appjit/tsts/case1/from.lis

0 → 100644
+2 −0
Original line number Diff line number Diff line 
output/PSP_007556_2010_RED4.balance.cropped.cub

output/PSP_007556_2010_RED5.balance.cropped.cub