Commit d8657eef authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Changed category tests to use default preference file. Fixes #2374 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6681 41f8697f-d340-4b68-9986-7bafba869bb8
parent 06995d6e

isis/make/isismake.tsts

+6 −3
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ NOOUTPUT =echo Error ... Output folder does not exist 
FILECOUNTMISMATCH =echo Failed ... Number of files in truth and output folder do not match

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



DIRPATTERN=2774

FILEPATTERN=2664

DIRLISTPATTERN="drwxrwsr--"
@@ -343,7 +346,7 @@ comparefiles: FORCE 
	      fi;                                                                  \

	                                                                           \

	      $(ISISROOT)/bin/cubediff                                             \

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

	          $(TSTARGS)                                                       \

	          from=$(TRUTH)/$$FILE                                             \

	          from2=$(OUTPUT)/$$FILE                                           \

	          to=compare.txt                                                   \
@@ -407,7 +410,7 @@ comparefiles: FORCE 
	      fi;                                                                  \

	                                                                           \

	      $(ISISROOT)/bin/pvldiff                                              \

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

	          $(TSTARGS)                                                       \

	          from=$(TRUTH)/$$FILE                                             \

	          from2=$(OUTPUT)/$$FILE                                           \

	          to=compare.txt                                                   \
@@ -441,7 +444,7 @@ comparefiles: FORCE 
	      fi;                                                                  \

	                                                                           \

	      $(ISISROOT)/bin/cnetdiff                                             \

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

	          $(TSTARGS)                                                       \

	          from=$(TRUTH)/$$FILE                                             \

	          from2=$(OUTPUT)/$$FILE                                           \

	          to=compare.txt                                                   \

isis/src/base/tsts/CropCam2map/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ labels.txt.IGNORELINES = ByteOrder StartByte Bytes 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(APP1NAME) from= $(INPUT)/lua0825f.cub \

	$(APP1NAME) $(TSTARGS) from= $(INPUT)/lua0825f.cub \

	  to= $(OUTPUT)/cropTruth.cub \

	  sample=13 nsamples=100 \

	  line=40 nlines=100 > /dev/null;

	$(APP2NAME) from= $(OUTPUT)/cropTruth.cub \

	$(APP2NAME) $(TSTARGS) from= $(OUTPUT)/cropTruth.cub \

	  to= $(OUTPUT)/CropCam2mapTruth.cub \

	  > /dev/null;

	catlab from=$(OUTPUT)/CropCam2mapTruth.cub > $(OUTPUT)/labels.pvl;
 
	catlab $(TSTARGS) from=$(OUTPUT)/CropCam2mapTruth.cub > $(OUTPUT)/labels.pvl;

isis/src/base/tsts/CropEnlargeCam2map/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ CropEnlargeCam2mapTruth.cub.TOLERANCE = 0.00001 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(APP1NAME) from= $(INPUT)/lua0825f.cub \

	$(APP1NAME) $(TSTARGS) from= $(INPUT)/lua0825f.cub \

	  to= $(OUTPUT)/cropTruth.cub+real \

	  sample=15 nsamples=150 \

	  line=50 nlines=150 > /dev/null;

	$(APP2NAME) from= $(OUTPUT)/cropTruth.cub \

	$(APP2NAME) $(TSTARGS) from= $(OUTPUT)/cropTruth.cub \

	  to= $(OUTPUT)/CropEnlargeTruth.cub+real \

	  interp=nearestneighbor sscale=2 lscale=2 > /dev/null;

	$(APP3NAME) from= $(OUTPUT)/CropEnlargeTruth.cub \

	$(APP3NAME) $(TSTARGS) from= $(OUTPUT)/CropEnlargeTruth.cub \

	  to= $(OUTPUT)/CropEnlargeCam2mapTruth.cub+real \

	  > /dev/null;

	catlab from=$(OUTPUT)/CropEnlargeCam2mapTruth.cub > $(OUTPUT)/labels.pvl;
 
	catlab $(TSTARGS) from=$(OUTPUT)/CropEnlargeCam2mapTruth.cub > $(OUTPUT)/labels.pvl;

isis/src/base/tsts/CropReduceCam2map/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ CropReduceCam2mapTruth.cub.TOLERANCE = 7.62939453125e-06 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(APP1NAME) from= $(INPUT)/lua0825f.cub \

	$(APP1NAME) $(TSTARGS) from= $(INPUT)/lua0825f.cub \

	  to= $(OUTPUT)/cropTruth.cub+real \

	  sample=15 nsamples=200 \

	  line=50 nlines=200 > /dev/null;

	$(APP2NAME) from= $(OUTPUT)/cropTruth.cub \

	$(APP2NAME) $(TSTARGS) from= $(OUTPUT)/cropTruth.cub \

	  to= $(OUTPUT)/CropReduceTruth.cub+real \

	  mode=total \

	  ons=150 onl=150 > /dev/null;

	$(APP3NAME) from= $(OUTPUT)/CropReduceTruth.cub \

	$(APP3NAME) $(TSTARGS) from= $(OUTPUT)/CropReduceTruth.cub \

	  to= $(OUTPUT)/CropReduceCam2mapTruth.cub+real \

	  > /dev/null;

	catlab from=$(OUTPUT)/CropReduceCam2mapTruth.cub \

	catlab $(TSTARGS) from=$(OUTPUT)/CropReduceCam2mapTruth.cub \

	  > $(OUTPUT)/labels.pvl;

isis/src/base/tsts/EnlargeCropCam2map/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -10,18 +10,18 @@ lowpassTruth.cub.TOLERANCE = 8 
include $(ISISROOT)/make/isismake.tsts



commands:

	$(APP1NAME) from= $(INPUT)/lua0825f.cub \

	$(APP1NAME) $(TSTARGS) from= $(INPUT)/lua0825f.cub \

	  to= $(OUTPUT)/enlargeTruth.cub+Real \

	  interp=bilinear sscale=1.5 lscale=1.5 > /dev/null;

	$(APP2NAME) from= $(OUTPUT)/enlargeTruth.cub \

	$(APP2NAME) $(TSTARGS) from= $(OUTPUT)/enlargeTruth.cub \

	  to= $(OUTPUT)/lowpassTruth.cub \

          samples=31 lines=31 > /dev/null;

	$(RM) $(OUTPUT)/enlargeTruth.cub > /dev/null;

	$(APP3NAME) from= $(OUTPUT)/lowpassTruth.cub \

	$(APP3NAME) $(TSTARGS) from= $(OUTPUT)/lowpassTruth.cub \

	  to= $(OUTPUT)/EnlargeCropTruth.cub \

	  sample=50 nsamples=200 \

	  line=100 nlines=200 > /dev/null;

	$(APP4NAME) from= $(OUTPUT)/EnlargeCropTruth.cub \

	$(APP4NAME) $(TSTARGS) from= $(OUTPUT)/EnlargeCropTruth.cub \

	  to= $(OUTPUT)/EnlargeCropCam2mapTruth.cub \

	  > /dev/null;

	catlab from=$(OUTPUT)/EnlargeCropCam2mapTruth.cub > $(OUTPUT)/labels.pvl;
 
	catlab $(TSTARGS) from=$(OUTPUT)/EnlargeCropCam2mapTruth.cub > $(OUTPUT)/labels.pvl;