Commit a3adbd69 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG Fixed test filepath problems in Makefiles. References #1449. 

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

isis/src/base/apps/campt/tsts/no_sample_line/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ commands: 
	$(APPNAME) from=$(INPUT)/ab102401.cub \

	> $(OUTPUT)/noSampleLineTruth.txt;

	cat $(OUTPUT)/noSampleLineTruth.txt | \

	sed 's/\([0-9]*\.[0-9]\{5\}\)[0-9]*/\1/g' \

	$(SED) 's/\([0-9]*\.[0-9]\{5\}\)[0-9]*/\1/g' | \

	$(SED) 's/\(.*= \).*\(ab102401.cub\)/\1\2/' \

	>& $(OUTPUT)/noSampleLineTruthtmp.txt;

	$(MV) $(OUTPUT)/noSampleLineTruthtmp.txt \

	$(OUTPUT)/noSampleLineTruth.txt;

isis/src/base/apps/campt/tsts/pointlist_append/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ commands: 
	coordlist=$(INPUT)/image.lis \

	to=$(OUTPUT)/pointlistAppendTruth.pvl \

	coordtype=IMAGE > /dev/null;

	cat $(OUTPUT)/pointlistAppendTruth.pvl | \

	$(SED) 's/\(.*= \).*\(ab102401.cub\)/\1\2/g' \

	> $(OUTPUT)/pointlistAppendTruthtmp.pvl;

	$(MV) $(OUTPUT)/pointlistAppendTruthtmp.pvl \

	$(OUTPUT)/pointlistAppendTruth.pvl;

	$(APPNAME) from=$(INPUT)/ab102401.cub \

	coordlist=$(INPUT)/image.lis \

	format=FLAT coordtype=IMAGE \
@@ -19,3 +24,8 @@ commands: 
	coordlist=$(INPUT)/image.lis \

	format=FLAT coordtype=IMAGE \

	to=$(OUTPUT)/pointlistAppendTruth.csv > /dev/null;

	cat $(OUTPUT)/pointlistAppendTruth.csv | \

	$(SED) 's/^.*\(ab102401.cub\)\(.*\)/\1\2/g' \

	> $(OUTPUT)/pointlistAppendTruthtmp.csv;

	$(MV) $(OUTPUT)/pointlistAppendTruthtmp.csv \

	$(OUTPUT)/pointlistAppendTruth.csv;

isis/src/base/apps/campt/tsts/pointlist_error/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -7,3 +7,8 @@ commands: 
	coordlist=$(INPUT)/image_error.lis \

	to=$(OUTPUT)/pointlistErrorTruth.pvl \

	append=false coordtype=IMAGE > /dev/null;

	cat $(OUTPUT)/pointlistErrorTruth.pvl | \

	$(SED) 's/\(.*= \).*\(ab102401.cub\)/\1\2/g' \

	> $(OUTPUT)/pointlistErrorTruthtmp.pvl;

	$(MV) $(OUTPUT)/pointlistErrorTruthtmp.pvl \

	$(OUTPUT)/pointlistErrorTruth.pvl;

isis/src/base/apps/campt/tsts/pointlist_flat/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -5,8 +5,11 @@ include $(ISISROOT)/make/isismake.tsts 
commands:

	$(APPNAME) from=$(INPUT)/ab102401.cub \

	coordlist=$(INPUT)/image.lis \

	to=$(OUTPUT)/temp.csv \

	to=$(OUTPUT)/pointlistFlatTruth.csv \

	format=FLAT coordtype=IMAGE \

	append=false > /dev/null;

	cut -d , -f 2- $(OUTPUT)/temp.csv >& $(OUTPUT)/pointlistFlatTruth.csv;

	rm $(OUTPUT)/temp.csv;
 
	cat $(OUTPUT)/pointlistFlatTruth.csv | \

	$(SED) 's/^.*\(ab102401.cub\)\(.*\)/\1\2/g' \

	> $(OUTPUT)/pointlistFlatTruthtmp.csv;

	$(MV) $(OUTPUT)/pointlistFlatTruthtmp.csv \

	$(OUTPUT)/pointlistFlatTruth.csv;

isis/src/base/apps/campt/tsts/pointlist_ground/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -7,3 +7,8 @@ commands: 
	coordlist=$(INPUT)/ground.lis \

	to=$(OUTPUT)/pointlistGroundTruth.pvl \

	append=false coordtype=GROUND > /dev/null;

	cat $(OUTPUT)/pointlistGroundTruth.pvl | \

	$(SED) 's/\(.*= \).*\(ab102401.cub\)/\1\2/g' \

	> $(OUTPUT)/pointlistGroundTruthtmp.pvl; 

	$(MV) $(OUTPUT)/pointlistGroundTruthtmp.pvl \

	$(OUTPUT)/pointlistGroundTruth.pvl;