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

Updated Makefiles for cnetadd's default and point tests, updated Makefile for... 

Updated Makefiles for cnetadd's default and point tests, updated Makefile for cnetcheck's ignore tests. The changes sort the TOLIST output (since that output relies on retrieving data from a QHash (Qt5).

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/v006LibrariesV2@6752 41f8697f-d340-4b68-9986-7bafba869bb8
parent 6861a9c0

isis/src/control/apps/cnetadd/tsts/default/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ commands: 
	  extract=modified modifiedpoints=$(OUTPUT)/modified.txt \

	  onet=$(OUTPUT)/modifiednet.net log=$(OUTPUT)/modifiedlog.pvl \

	  > /dev/null;

	$(CAT) $(OUTPUT)/outlist.txt | sed 's#.*/##' > $(OUTPUT)/temp.txt;

	# Pipe to sort since output is obtained from a QHash

	$(CAT) $(OUTPUT)/outlist.txt | sed 's#.*/##' | sort > $(OUTPUT)/temp.txt

	$(MV) $(OUTPUT)/temp.txt $(OUTPUT)/outlist.txt;

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

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

isis/src/control/apps/cnetadd/tsts/point/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ commands: 
	  onet=$(OUTPUT)/outnet.net log=$(OUTPUT)/outlog.pvl \

	  retrieval=POINT tolist=$(OUTPUT)/outlist.txt \

	  > /dev/null;

	$(CAT) $(OUTPUT)/outlist.txt | sed 's#.*/##' > $(OUTPUT)/temp.txt;

	# Pipe to sort since output is obtained from a QHash

	$(CAT) $(OUTPUT)/outlist.txt | sed 's#.*/##' | sort > $(OUTPUT)/temp.txt;

	$(MV) $(OUTPUT)/temp.txt $(OUTPUT)/outlist.txt;

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

isis/src/control/apps/cnetcheck/tsts/ignore/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -17,4 +17,8 @@ commands: 
	  base=`basename $$i`; \

	  cat $$i | sed 's/.*\/\(.*\.cub\)/\1/g' | sed 's/\([0-9]\.[0-9]\{12\}\)\([0-9]*\)/\1/g' > $$base; \

	  $(MV) $$base $$i; \

	done
 
	done;



	# Sort LowCoverage.txt output file, since it gets data from a QHash

	$(CAT) $(OUTPUT)/*LowCoverage.txt | sort > $(OUTPUT)/sorted_LowCoverage.txt;

	$(MV) $(OUTPUT)/sorted_LowCoverage.txt $(OUTPUT)/catLowCoverage.txt;