Commit 452ebe9c authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Updated from v006LibrariesV2. Fixes tests for cnetadd, cnetcheck, SqlRecord. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6760 41f8697f-d340-4b68-9986-7bafba869bb8
parents 870d7bb6 1fd48dd5

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;

isis/src/database/objs/SqlRecord/SqlRecord_Linux_x86_64_Fedora21.truth

+1 −1
Original line number Diff line number Diff line 
v1: test text

v2: 7

v3: 123.4

v3: 123.40000000000001

Is null (v1): 0

Is null (blank): 1

Size: 3