Unverified Commit fc8baa5a authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

Merge pull request #19 from cneubauerUSGS/cmake 

Unit Test and App Test Fixes
parents 12cc9941 fe989c54

isis/CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -226,6 +226,9 @@ add_subdirectory(src objects) 
# Set up third party libraries for installation

install_third_party()



# Some unit and app test rely on a 3rdParty structure and need to be copied

execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/3rdParty ${CMAKE_BINARY_DIR}/3rdParty/lib ${CMAKE_BINARY_DIR}/3rdParty/plugins)



# Create a link from the build/objects directory to each folder in 3rdPartyLibs/plugins.

# - This is required so that the plugins can be found during unit tests.

# TIP: Set "export QT_DEBUG_PLUGINS=1" to help debug plugin errors.
@@ -234,6 +237,7 @@ foreach(plugin ${THIRDPARTYPLUGINFOLDERS}) 
  if(NOT EXISTS ${CMAKE_BINARY_DIR}/lib/${pluginName})

    execute_process(COMMAND ln -s "${plugin}" ${pluginName}

    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/lib")

    execute_process(COMMAND cp -r ${CMAKE_BINARY_DIR}/lib/${pluginName} ${CMAKE_BINARY_DIR}/3rdParty/plugins/)

  endif()

endforeach()

isis/cmake/AddIsisModule.cmake

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ function(add_isis_obj folder reqLibs) 
    set(pluginPath ${CMAKE_BINARY_DIR}/lib/${pluginName})

    cat(${plugins} ${pluginPath})

    install(PROGRAMS ${pluginPath} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)



    # Record this library name for the caller

    set(newPluginLib ${libName}  PARENT_SCOPE)

  endif()

isis/cmake/RunMakeFileTest.cmake

+6 −8
Original line number Diff line number Diff line
@@ -77,5 +77,3 @@ endfunction() 
set(ENV{ISIS3DATA} "${DATA_ROOT}")



run_app_makefile_test(${MAKEFILE} ${INPUT_DIR} ${OUTPUT_DIR} ${TRUTH_DIR} ${BIN_DIR})

isis/make/isismake.tsts

+51 −51
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ endif 
# Make sure all apps use the correct preferences file when testing, unless

# they have set NOPREFERENCES. This is valid for non-Isis apps.

ifeq ($(origin NOPREFERENCES), undefined)

  APPNAME += -preference=$(ISISROOT)/src/base/objs/Preference/TestPreferences

  APPNAME += -preference=$(ISISROOT)/TestPreferences

endif



# set the output variable to the output directory
@@ -105,7 +105,7 @@ FILECOUNTMISMATCH =echo Failed ... Number of files in truth and output folder do 
NOTALLMATCH =echo Failed ... Not all files in truth and output folders match



# Set test arguments for use in category tests

TSTARGS = -preference=$(ISISROOT)/src/base/objs/Preference/TestPreferences

TSTARGS = -preference=$(ISISROOT)/TestPreferences



DIRPATTERN=2774

FILEPATTERN=2664

isis/src/base/objs/FileName/unitTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) { 
  // Variable expansion will change truth data on these

  QStringList filesToTestSafely;

  filesToTestSafely << "$base/testData/isisTruth.cub" << "${base}/testData/isisTruth.cub"

                    << "$ISISROOT/src/Makefile" << "$ISISROOT/src/Makefile.elifekaM"

                    << "$ISISROOT/Makefile" << "$ISISROOT/Makefile.elifekaM"

                    << "/$TEMPORARY/unitTest.cpp";



  foreach (QString fileToTest, filesToTestSafely) {