Commit 4f3d8a24 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Fixed build warning and failing test. Added --copy-links in isismake.tst so... 

Fixed build warning and failing test. Added --copy-links in isismake.tst so that rsync will follow symlinks.
parent b62faf0a

isis/make/isismake.tsts

+2 −2
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ checkout: FORCE 
	    if [ "$$inputdir" != "" ]; \

	    then \

	      $(MAKE) dirs; \

	      $(RSYNC) -rt --delete $(TESTDATA_PATH)/input/ input; \

	      $(RSYNC) -rt --copy-links --delete $(TESTDATA_PATH)/input/ input; \

	    fi; \

	  fi; \

	  $(MAKE) copyOutTruth DEST=$(TESTDATA_PATH); \
@@ -795,7 +795,7 @@ copyOutTruth: FORCE 
	  files=`$(LS) $(DEST)/$$i`; \

	  if [ "$$files" != "" ]; \

	  then \

	    $(RSYNC) -rt --delete $(DEST)/$$i/ $$i; \

	    $(RSYNC) -rt --copy-links --delete $(DEST)/$$i/ $$i; \

	  fi; \

	done;

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

+4 −4
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ commands: 


	if [ `$(APPNAME) csv=$(INPUT)/not_a_file.csv \

	     tablename="TestTable" \

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

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

	then \

	  true; \

	fi;



	if [ `$(APPNAME) csv=$(INPUT)/empty.csv \

	      tablename="TestTable" \

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

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

	then \

	  true; \

	fi;
@@ -22,12 +22,12 @@ commands: 
	if [ `$(APPNAME) csv=$(INPUT)/test.csv \

	      label=$(INPUT)/not_a_file.pvl \

	      tablename="TestTable" \

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

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

	then \

	  true; \

	fi;



	cat $(OUTPUT)/errors.txt | sed 's/\/[^ ]*\/input\///g' \

	cat $(OUTPUT)/errors.txt | sed 's+\[.*input/+[+' \

	    > $(OUTPUT)/clean_errors.txt;



	rm $(OUTPUT)/isisTruth.cub $(OUTPUT)/errors.txt;

isis/src/base/apps/trackextract/trackextract.cpp

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ using namespace Isis; 


// Taken from ProcessMosaic

const int FLOAT_MIN = -16777215;

const int FLOAT_MAX = 16777216;



void findTrackBand(QString inputName, QVector<QString> &copyBands, int &trackBand);

void createMosaicCube(QString inputName, QString outputName, QVector<QString> bandsVector);

isis/src/base/apps/trackextract/trackextract.xml

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ 
      this. Also fixed the NULL value being written to the tracking cube as LRS was originally

      being written instead.

    </change>

    <change name="Kaitlyn Lee" date="2018-10-16">

      Removed FLOAT_MAX because it was not being used in the code and was causing build warnings 

      on MacOS 10.13.

    </change>

  </history>



  <groups>

isis/src/base/objs/CSVReader/CSVReader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ namespace Isis { 
  void CSVReader::read(const QString &csvfile) {

    ifstream ifile(csvfile.toLatin1().data(), ios::in);

    if(!ifile) {

      QString mess = "Unable to open file " + csvfile;

      QString mess = "Unable to open file [" + csvfile + "]";

      throw IException(IException::User, mess, _FILEINFO_);

    }
@@ -430,7 +430,7 @@ namespace Isis { 


    if(!ifile.eof()) {

      ostringstream mess;

      mess << "Error reading line " << (nlines + 1) << ends;

      mess << "Error reading line [" << (nlines + 1) << "]" << ends;

      throw IException(IException::User, mess.str(), _FILEINFO_);

    }