Unverified Commit 3bdcef86 authored by Stuart Sides's avatar Stuart Sides Committed by GitHub
Browse files

Updated unit tests to use data from ISISTESTDATA instead of ISISDATA (#4293) 

* Moved location of unitTest data file to ISISTESTDATA

* Moved unit test data to ISISTESTDATA/../testDataLocal

* fixed bad path

* fixed path to test files

* updated to use non mission dir data files
parent 0898712b

isis/src/base/apps/blend/tsts/default/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -7,10 +7,12 @@ I02609002RDR.lev2.blend.cub.TOLERANCE = 0.001 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) fromlist=$(INPUT)/fromlist.lis \

	$(LS) $(INPUT)/*.cub > fromlist.lis;

	$(APPNAME) fromlist=fromlist.lis \

	  tolist=$(INPUT)/tolist.lis \

	  stop=200 \

	  > /dev/null;

	$(MV) I00824006RDR.lev2.blend.cub $(OUTPUT)/I00824006RDR.lev2.blend.cub;

	$(MV) I01523019RDR.lev2.blend.cub $(OUTPUT)/I01523019RDR.lev2.blend.cub;

	$(MV) I02609002RDR.lev2.blend.cub $(OUTPUT)/I02609002RDR.lev2.blend.cub;

	$(RM) fromlist.lis;

isis/src/base/apps/blend/tsts/themis/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ I23851018.blend.cub.TOLERANCE = .00001 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(LS) -r $(INPUT)/*.cub > fromlist.lis

	$(LS) -r $(INPUT)/*.cub > fromlist.lis;

	$(APPNAME) fromlist=fromlist.lis \

	  tolist=$(INPUT)/tolist.lis \

	  stop=200 \

isis/src/base/apps/cubeit/tsts/badinputs/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -7,8 +7,10 @@ include $(ISISROOT)/make/isismake.tsts 
commands:

#    TEST A: pass in a list of cubes with different sizes

	echo -e "Different sized cubes:" > $(OUTPUT)/error_temp.txt;

	$(LS) -r $(INPUT)/isisTruth.cub $(INPUT)/f319b18.cub >> $(OUTPUT)/tmp.lis;

	$(CAT) $(OUTPUT)/tmp.lis | $(SED) 's/isisTruth.cub/isisTruth.cub+1/' > $(OUTPUT)/input.lis;

	if [ `$(APPNAME) \

	  fromlist=$(INPUT)/input.lis \

	  fromlist=$(OUTPUT)/input.lis \

	  to=$(OUTPUT)/error.cub \

	  2>> $(OUTPUT)/error_temp.txt > /dev/null` ]; \

	  then true; \
@@ -40,6 +42,8 @@ commands: 
	$(SED) 's+\[/.*/output/+\[output/+' $(OUTPUT)/error_temp3.txt > $(OUTPUT)/error.txt;



#    Cleanup

	$(RM) $(OUTPUT)/tmp.lis;

	$(RM) $(OUTPUT)/input.lis;

	$(RM) $(OUTPUT)/error_temp.txt;

	$(RM) $(OUTPUT)/error_temp2.txt;

	$(RM) $(OUTPUT)/error_temp3.txt;

isis/src/base/apps/cubeit/tsts/default/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -3,5 +3,9 @@ APPNAME = cubeit 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) fromlist=$(INPUT)/inputList.lis \

	$(ECHO) $(INPUT)/isisTruth.cub+2 > $(OUTPUT)/inputList.lis;

	$(ECHO) $(INPUT)/isisTruth.cub >> $(OUTPUT)/inputList.lis;

	$(ECHO) $(INPUT)/isisTruth.cub+1 >> $(OUTPUT)/inputList.lis;

	$(APPNAME) fromlist=$(OUTPUT)/inputList.lis \

	  to=$(OUTPUT)/cubeitTruth1.cub > /dev/null;

	$(RM) $(OUTPUT)/inputList.lis;

isis/src/base/apps/equalizer/tsts/apply/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -3,10 +3,15 @@ APPNAME = equalizer 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) fromlist=$(INPUT)/FromList.lst \

	$(LS) -r $(INPUT)/*.cub > $(OUTPUT)/Fromlist.lst;

	$(CAT) $(INPUT)/instats.pvl | $(SED) "s|FileName = .*odyssey/testData/|FileName = $(INPUT)/|" > $(OUTPUT)/instats.pvl;

	$(APPNAME) fromlist=$(OUTPUT)/FromList.lst \

	  tolist=$(INPUT)/ToList.lst \

	  instats=$(INPUT)/instats.pvl \

	  instats=$(OUTPUT)/instats.pvl \

	  process=apply \

	  > /dev/null;

	$(MV) I00824006RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth1.cub;

	$(MV) I01523019RDR.lev2.equ.cub $(OUTPUT)/equalizerTruth2.cub;

	$(RM) $(OUTPUT)/FromList.lst;

	$(RM) $(OUTPUT)/instats.pvl;