Commit 2a9ba5b1 authored by Stuart Sides's avatar Stuart Sides Committed by Kelvin Rodriguez
Browse files

Fix for spkwriter test failing with bad personal IsisPreference file.… (#3624) 

* Fix for spkwriter test failing with bad personal IsisPreference file. Fixes #3623

* Used TSTARGS instead of explicit preference file
parent 95cabf51

isis/src/base/apps/spkwriter/tsts/apollo15_mixed/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ commands: $(BASES) 
#  Only use 12 digits in the output of tabledump due to precision issues

$(BASES): $(OUTPUT)/apollo15_mixed.bsp

	$(CP) $(INPUT)/$@.cub $(OUTPUT)

	spiceinit from=$(OUTPUT)/$@.cub ckrecon=true cksmithed=true spk=$(OUTPUT)/apollo15_mixed.bsp > /dev/null;

	tabledump from=$(OUTPUT)/$@.cub to=$(OUTPUT)/$@.txt \

	spiceinit $(TSTARGS) from=$(OUTPUT)/$@.cub ckrecon=true cksmithed=true \

	  spk=$(OUTPUT)/apollo15_mixed.bsp > /dev/null;

	tabledump $(TSTARGS) from=$(OUTPUT)/$@.cub to=$(OUTPUT)/$@.txt \

	  name=InstrumentPosition > /dev/null;

	$(RM) $(OUTPUT)/$@.cub

isis/src/base/apps/spkwriter/tsts/mariner10/Makefile

+7 −7
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ commands: 
	$(APPNAME) FROM=$(INPUT)/0027399.cub \

	           TO=$(OUTPUT)/0027399.bsp > /dev/null;

	$(CP) $(INPUT)/0027399.cub $(OUTPUT)

	spiceinit from=$(OUTPUT)/0027399.cub \

	spiceinit $(TSTARGS) from=$(OUTPUT)/0027399.cub \

	   spk=$(OUTPUT)/0027399.bsp > /dev/null;

	tabledump from=$(OUTPUT)/0027399.cub \

	tabledump $(TSTARGS) from=$(OUTPUT)/0027399.cub \

	  to=$(OUTPUT)/0027399.dat \

	  name=InstrumentPosition > /dev/null;

	cat $(OUTPUT)/0027399.dat \

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

	  > $(OUTPUT)/0027399.txt;

	cat $(OUTPUT)/0027399.dat | \

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

	  $(OUTPUT)/0027399.txt;

	$(RM) $(OUTPUT)/0027399.cub 

	$(RM) $(OUTPUT)/0027399.bsp

	$(RM) $(OUTPUT)/0027399.dat

isis/src/base/apps/spkwriter/tsts/messenger/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ commands: 
	$(APPNAME) FROM=$(INPUT)/EW1025478282G.lev1.cub \

	  TO=$(OUTPUT)/EW1025478282G.bsp > /dev/null;

	$(CP) $(INPUT)/EW1025478282G.lev1.cub $(OUTPUT)

	spiceinit from=$(OUTPUT)/EW1025478282G.lev1.cub \

	spiceinit $(TSTARGS) from=$(OUTPUT)/EW1025478282G.lev1.cub \

	  spk=$(OUTPUT)/EW1025478282G.bsp > /dev/null;

	tabledump from=$(OUTPUT)/EW1025478282G.lev1.cub \

	tabledump $(TSTARGS) from=$(OUTPUT)/EW1025478282G.lev1.cub \

	  to=$(OUTPUT)/EW1025478282G.txt \

	  name=InstrumentPosition > /dev/null;

#	cat $(OUTPUT)/EW1025478282G.dat \