Commit 890f8df9 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

removed debug prints, unittests now run as ./unitTest

parent bc1a1f93

isis/cmake/RunUnitTest.cmake

+4 −8
Original line number Diff line number Diff line
@@ -23,19 +23,15 @@ get_filename_component(truthFolder ${TRUTH_FILE} DIRECTORY) 
#  otherwise a GUI will pop up and ruin the test.

get_filename_component(binFolder ${TEST_PROG} DIRECTORY)

get_filename_component(binName   ${TEST_PROG} NAME)

set(tempDir  ${binFolder}/${binName}_temp)

execute_process(COMMAND rm -rf ${tempDir})

execute_process(COMMAND mkdir -p ${tempDir})



execute_process(COMMAND ln -s ${TEST_PROG} ${tempLink})

execute_process(COMMAND ln -s ${truthFolder}/unitTest.xml ${truthFolder}/${binName}.xml)



message("TEMP DIR: ${tempDir}")

message("Bin Name: ${binName}")

message("Bin Folder: ${binFolder}")

message("TEST_PROG: ${TEST_PROG}")

message("tempLink: " ${tempLink})

message("truthFolder" ${truthFolder})



# Run the unit test executable and pipe the output to a text file.

execute_process(COMMAND ${TEST_PROG}

execute_process(COMMAND  ./unitTest

                WORKING_DIRECTORY ${truthFolder}

                OUTPUT_FILE ${outputFile}

                ERROR_FILE ${outputFile}

isis/src/base/objs/Application/unitTest.exclude

+1 −0
Original line number Diff line number Diff line
@@ -6,4 +6,5 @@ IsisVersion 
Connect

Cpu

Program =

File

isis/src/base/objs/Preference/Preference.cpp

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ namespace Isis { 
    else if(unitTest) {

      p_unitTest = unitTest;

      p_preference->clear();

      p_preference->Load("$ISISROOT/src/base/objs/Preference/TestPreferences");

      p_preference->Load("$ISISROOT/TestPreferences");

    }



    return *p_preference;