Commit 3a90727c authored by Oxez's avatar Oxez
Browse files

Changes output directory for apptests and help apps find TestPreferences

parent 26803378

isis/cmake/RunMakeFileTest.cmake

+7 −9
Original line number Diff line number Diff line
@@ -76,6 +76,4 @@ endfunction() 
# Needed for IsisPreferences and other test data to be found

set(ENV{ISIS3DATA} "${DATA_ROOT}")



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



run_app_makefile_test(${MAKEFILE} ${INPUT_DIR} ${testOutputDir} ${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