Commit 744e1d55 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

PROG: Updated Makefiles for cnetcombinept so that ControlNetworks will be... 

PROG:  Updated Makefiles for cnetcombinept so that ControlNetworks will be output as PVL files (so that *pvl.DIFF can be applied for the truth-output comparison).  References #4870,4722,4869

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

isis/src/control/apps/cnetcombinept/tsts/duplicates/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -6,5 +6,8 @@ commands: 
	$(CP) $(INPUT)/*.net $(OUTPUT)

	$(APPNAME) cnetbase=$(INPUT)/Extract_thmir_dups.net \

	onet=$(OUTPUT)/testout_Extract_thmir_dups.net > /dev/null;

	cnetbin2pvl from=$(OUTPUT)/testout_Extract_thmir_dups.net \

				to=$(OUTPUT)/testout_Extract_thmir_dups.pvl \

				> /dev/null;



	$(RM) $(OUTPUT)/Extract_thmir_dups.net;
 
	$(RM) $(OUTPUT)/*.net;

isis/src/control/apps/cnetcombinept/tsts/messenger/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -10,5 +10,9 @@ commands: 
	           description="Messenger data test" \

	           imagetol=3000.0 \

	           > /dev/null;

	cnetbin2pvl from=$(OUTPUT)/Equi065S355ED10.net \

				   to=$(OUTPUT)/Equi065S355ED10.pvl \

				   > /dev/null;



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

	$(RM) $(OUTPUT)/*.net

isis/src/control/apps/cnetcombinept/tsts/noclean/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -12,5 +12,8 @@ commands: 
	           cleannet=false \

	           cleanmeasures=false \

	           > /dev/null;

	cnetbin2pvl from=$(OUTPUT)/Equi065S355ED10.net to=$(OUTPUT)/Equi065S355ED10.pvl \

			   > /dev/null;



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

	$(RM) $(OUTPUT)/*.net

isis/src/control/apps/cnetcombinept/tsts/setapriori/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -11,5 +11,8 @@ commands: 
	           imagetol=1000.0 \

	           setaprioribest=true \

	           > /dev/null;

	cnetbin2pvl from=$(OUTPUT)/Equi065S355ED10.net to=$(OUTPUT)/Equi065S355ED10.pvl \

			   > /dev/null;



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

	$(RM) $(OUTPUT)/*.net