Commit fe19e4ae authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Updated mdiscal appTest Makefiles. MAC OS's use an old version of bash... 

PROG: Updated mdiscal appTest Makefiles. MAC OS's use an old version of bash and didn't recognize the command '&>>', so it was replaced with '2>>'. References #2332 #2338

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6373 41f8697f-d340-4b68-9986-7bafba869bb8
parent d59bb70f

isis/src/messenger/apps/mdiscal/tsts/errors/Makefile

+12 −4
Original line number Diff line number Diff line
@@ -6,20 +6,28 @@ commands: 
	# multiband input cube

	if [[ `$(APPNAME) \

	  from=$(INPUT)/multiband.cub \

	  to=$(OUTPUT)/multiband.cub 2>> $(OUTPUT)/errors_temp.txt` ]]; \

	  to=$(OUTPUT)/multiband.cub \

	  2> $(OUTPUT)/errors_temp.txt \

	  > /dev/null` ]]; \

	then true; \

	fi;

	# samples < 3

	if [[ `$(APPNAME) \

	  from=$(INPUT)/samps.cub \

	  to=$(OUTPUT)/samps.cub &>> $(OUTPUT)/errors_temp.txt` ]]; \

	  to=$(OUTPUT)/samps.cub \

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

	  > /dev/null` ]]; \

	then true; \

	fi;

	# Unlutted = false

	if [[ `$(APPNAME) \

	  from=$(INPUT)/lutted.cub \

	  to=$(OUTPUT)/lutted.cub &>> $(OUTPUT)/errors_temp.txt` ]]; \

	  to=$(OUTPUT)/lutted.cub \

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

	  > /dev/null` ]]; \

	then true; \

	fi;

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



	$(SED) 's+\[.*/input/+\[input/+' $(OUTPUT)/errors_temp.txt \

	&> $(OUTPUT)/errors.txt;

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

isis/src/messenger/apps/mdiscal/tsts/warnings/Makefile

+19 −9
Original line number Diff line number Diff line
@@ -10,45 +10,55 @@ commands: 
	if [[ `$(APPNAME) \

	FROM=$(INPUT)/EW0089565626A_modifiedExposure.cub \

	to=$(OUTPUT)/model_longExposure.cub \

	DARKCURRENT=model 2>> $(OUTPUT)/warnings.txt > /dev/null` ]]; \

	DARKCURRENT=model \

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

	> /dev/null` ]]; \

	then true; \

	fi;

	$(RM) $(OUTPUT)/model_longExposure.cub;





	echo -e "\nTEST WARNING: DarkCurrent=Linear and no valid dark." &>> $(OUTPUT)/warnings.txt;

	echo -e "\nTEST WARNING: DarkCurrent=Linear and no valid dark." >> $(OUTPUT)/warnings.txt;

	if [[ `$(APPNAME) \

	FROM=$(INPUT)/EW0089565626A_modifiedExposureAndPixelBin.cub \

	to=$(OUTPUT)/linear.cub \

	DARKCURRENT=Linear 2>> $(OUTPUT)/warnings.txt > /dev/null` ]]; \

	DARKCURRENT=Linear \

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

	> /dev/null` ]]; \

	then true; \

	fi;





	echo -e "\nTEST WARNING: DarkCurrent=Linear and no valid dark." &>> $(OUTPUT)/warnings.txt;

	echo -e "\nTEST WARNING: DarkCurrent=Linear and no valid dark." >> $(OUTPUT)/warnings.txt;

	if [[ `$(APPNAME) \

	  FROM=$(INPUT)/EW0089565626A_modifiedExposureAndPixelBin.cub \

	  to=$(OUTPUT)/standard.cub \

	DARKCURRENT=standard 2>> $(OUTPUT)/warnings.txt > /dev/null` ]]; \

	  DARKCURRENT=standard \

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

	  > /dev/null` ]]; \

	then true; \

	fi;





	echo -e "\nTEST WARNING: DarkCurrent=Model, exposure > 1, no valid dark." \

	&>> $(OUTPUT)/warnings.txt;

	>> $(OUTPUT)/warnings.txt;

	if [[ `$(APPNAME) \

	  FROM=$(INPUT)/EW0089565626A_modifiedExposureAndPixelBin.cub \

	  to=$(OUTPUT)/model.cub \

	DARKCURRENT=model 2>> $(OUTPUT)/warnings.txt > /dev/null` ]]; \

	  DARKCURRENT=model \

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

	  > /dev/null` ]]; \

	then true; \

	fi;





	echo -e "\nFOR TEST COVERAGE: DarkCurrent=None and no valid dark." &>> $(OUTPUT)/warnings.txt;

	echo -e "\nFOR TEST COVERAGE: DarkCurrent=None and no valid dark." >> $(OUTPUT)/warnings.txt;

	if [[ `$(APPNAME) \

	  FROM=$(INPUT)/EW0089565626A_modifiedExposureAndPixelBin.cub \

	  to=$(OUTPUT)/nodark.cub \

	DARKCURRENT=none 2>> $(OUTPUT)/warnings.txt > /dev/null` ]]; \

	  DARKCURRENT=none \

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

	  > /dev/null` ]]; \

	then true; \

	fi;