Unverified Commit 1dded5b3 authored by Makayla Shepherd's avatar Makayla Shepherd Committed by GitHub
Browse files

Merge pull request #10 from ihumphrey-usgs/jigsaw-errors-prog26 

PROG replaced -i flag for sed for jigsaw errors test
parents 4c3e60bc 577af224

isis/src/control/apps/jigsaw/tsts/errors/Makefile

+10 −9
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ include $(ISISROOT)/make/isismake.tsts 


commands:

# TEST A: CAMSOLVE=None and SPSOLVE=None

	echo -e "Error Test A:" > $(OUTPUT)/error.txt;

	echo -e "Error Test A:" > $(OUTPUT)/error_temp.txt;

	if [[ `$(APPNAME) \

	  fromlist=$(INPUT)/empty.lis \

	  cnet=$(INPUT)/empty.net \

	  onet=$(OUTPUT)/out.net \

	  camsolve=None \

	  spsolve=None \

	  2>> $(OUTPUT)/error.txt \

	  2>> $(OUTPUT)/error_temp.txt \

	  > /dev/null` ]]; \

	then \

	  true; \
@@ -30,33 +30,33 @@ commands: 
# TEST B: exception occurs when performing bundle adjust

#         TODO: This still needs to be tested.

# TEST C: SOLVETARGETBODY=yes and TBPARAMETERS file missing Target object

	echo -e "Error Test C:" >> $(OUTPUT)/error.txt;

	echo -e "Error Test C:" >> $(OUTPUT)/error_temp.txt;

	if [[ `$(APPNAME) \

	  fromlist=$(INPUT)/empty.lis \

	  cnet=$(INPUT)/empty.net \

	  onet=$(OUTPUT)/out.net \

	  solvetargetbody=yes \

	  tbparameters=$(INPUT)/invalidTargetParameters.pvl \

	  2>> $(OUTPUT)/error.txt \

	  2>> $(OUTPUT)/error_temp.txt \

	  > /dev/null` ]]; \

	then \

	  true; \

	fi;

# TEST D: SOLVETARGETBODY=yes and # of parameters to solve is 0

	echo -e "Error Test D:" >> $(OUTPUT)/error.txt;

	echo -e "Error Test D:" >> $(OUTPUT)/error_temp.txt;

	if [[ `$(APPNAME) \

	  fromlist=$(INPUT)/empty.lis \

	  cnet=$(INPUT)/empty.net \

	  onet=$(OUTPUT)/out.net \

	  solvetargetbody=yes \

	  tbparameters=$(INPUT)/zeroTargetParameters.pvl \

	  2>> $(OUTPUT)/error.txt \

	  2>> $(OUTPUT)/error_temp.txt \

	  > /dev/null` ]]; \

	then \

	  true; \

	fi;

# TEST F: CNET=[invalid control net file]

	echo -e "Error Test F:" >> $(OUTPUT)/error.txt;

	echo -e "Error Test F:" >> $(OUTPUT)/error_temp.txt;

	if [[ `$(APPNAME) \

	  fromlist=$(INPUT)/empty.lis \

	  cnet=$(INPUT)/notacnet.net \
@@ -66,10 +66,11 @@ commands: 
	  point_radius_sigma=500 \

	  spacecraft_position_sigma=500 \

	  camera_angles_sigma=2 \

	  2>> $(OUTPUT)/error.txt \

	  2>> $(OUTPUT)/error_temp.txt \

	  > /dev/null` ]]; \

	then \

	  true; \

	fi;

# Remove paths from errors file

	sed -i 's/\(\[\)\/.*\(input\)/\1\2/g' $(OUTPUT)/error.txt;
 
	$(SED) 's/\(\[\)\/.*\(input\)/\1\2/g' $(OUTPUT)/error_temp.txt > $(OUTPUT)/error.txt;

	$(RM) $(OUTPUT)/error_temp.txt;