Unverified Commit 8a508cb4 authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #271 from kdl222/m0703 

Updated ddd2isis test to remove path of the input files
parents a9f6d788 bf12d998

isis/src/base/apps/ddd2isis/tsts/errors/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -7,13 +7,18 @@ commands: 
	if [ `$(APPNAME) \

		FROM=$(INPUT)/vis1flat.ddd \

		TO=$(OUTPUT)/vis1flat.cub \

		2> $(OUTPUT)/errorTruth.txt > /dev/null` ]; \

		2> $(OUTPUT)/temp.txt > /dev/null` ]; \

		then true; \

		fi;



	# TEST: Throws an error when trying to read from a cub instead of ddd

	if [ `$(APPNAME) \

		FROM=$(INPUT)/vis1flat.cub \

		TO=$(OUTPUT)/vis1flat.cub \

		2>> $(OUTPUT)/errorTruth.txt > /dev/null` ]; \

		2>> $(OUTPUT)/temp.txt > /dev/null` ]; \

		then true; \

		fi;



	# Removes input file path up until input

	$(SED) 's+\[.*/input+[input+' $(OUTPUT)/temp.txt > $(OUTPUT)/errorTruth.txt;

	$(RM) $(OUTPUT)/temp.txt