Commit d3528c6c authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Integrated ssides's changes to isismake.apps and updated isismake.objs to get... 

Integrated ssides's changes to isismake.apps and updated isismake.objs to get Squish Coco working for developers. There are few remaining issues, but this should not impact developers' abilities to examine code coverage. References #2402.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7172 41f8697f-d340-4b68-9986-7bafba869bb8
parent 1f7af311

isis/make/isismake.apps

+6 −12
Original line number Diff line number Diff line
@@ -215,24 +215,18 @@ test: 
	  $(ECHO) -ne "Scope Coverage:      ";                                      \

	  $(CODE_COVERAGE_BIN_DIR)/cmreport                                         \

	      --title="`basename $$PWD` Application Test Scope Coverage"            \

	      -m "`basename $$PWD`.csmes" --select=".*" --bargraph --toc --stat     \

	      --global=all --method=all --source=all --execution=all                \

	      --method-sort=coverage --execution-sort=coverage                      \

	      --source-sort=coverage -h scopecoverage;                              \

	      -m "`basename $$PWD`.csmes" --stat                                    \

	      -h scopecoverage;                                                     \

	  $(ECHO) -ne "Line Coverage:       ";                                      \

	  $(CODE_COVERAGE_BIN_DIR)/cmreport                                         \

	      --title="`basename $$PWD` Application Test Line Coverage"             \

	      -m "`basename $$PWD`.csmes" --select=".*" --bargraph --toc --stat     \

	      --global=all --method=all --source=all --execution=all                \

	      --method-sort=coverage --execution-sort=coverage                      \

	      --source-sort=coverage --line-coverage -h linecoverage;               \

	      -m "`basename $$PWD`.csmes" --stat                                    \

	      --line-coverage -h linecoverage;                                      \

	  $(ECHO) -ne "Function Coverage:   ";                                      \

	  $(CODE_COVERAGE_BIN_DIR)/cmreport                                         \

	      --title="`basename $$PWD` Application Test Function Coverage"         \

	      -m "`basename $$PWD`.csmes" --select=".*" --bargraph --toc --stat     \

	      --global=all --method=all --source=all --execution=all                \

	      --method-sort=coverage --execution-sort=coverage                      \

	      --source-sort=coverage --function-coverage -h functioncoverage;       \

	      -m "`basename $$PWD`.csmes" --stat                                    \

	      --function-coverage -h functioncoverage;                              \

	fi;



testdir:

isis/make/isismake.objs

+18 −32
Original line number Diff line number Diff line
@@ -286,48 +286,34 @@ test: unitTest 
	  $(ECHO) -ne "Scope Coverage:      ";                                      \

	  $(CODE_COVERAGE_BIN_DIR)/cmreport                                         \

	      --title="`basename $$PWD` Unit Test Scope Coverage"                   \

	      -m "`basename $$PWD`.csmes" --select=".*" --bargraph --toc --stat     \

	      --global=all --method=all --source=all --execution=all                \

	      --method-sort=coverage --execution-sort=coverage                      \

	      --source-sort=coverage -h scopecoverage;                              \

	      -m "`basename $$PWD`.csmes" --stat                                    \

	      -h scopecoverage;                                                     \

	  $(ECHO) -ne "Line Coverage:       ";                                      \

	  $(CODE_COVERAGE_BIN_DIR)/cmreport                                         \

	      --title="`basename $$PWD` Unit Test Line Coverage"                    \

	      -m "`basename $$PWD`.csmes" --select=".*" --bargraph --toc --stat     \

	      --global=all --method=all --source=all --execution=all                \

	      --method-sort=coverage --execution-sort=coverage                      \

	      --source-sort=coverage --line-coverage -h linecoverage;               \

	      -m "`basename $$PWD`.csmes" --stat                                    \

	      --line-coverage -h linecoverage;                                      \

	  $(ECHO) -ne "Function Coverage:   ";                                      \

	  $(CODE_COVERAGE_BIN_DIR)/cmreport                                         \

	      --title="`basename $$PWD` Unit Test Function Coverage"                \

	      -m "`basename $$PWD`.csmes" --select=".*" --bargraph --toc --stat     \

	      --global=all --method=all --source=all --execution=all                \

	      --method-sort=coverage --execution-sort=coverage                      \

	      --source-sort=coverage --function-coverage -h functioncoverage;       \

	      -m "`basename $$PWD`.csmes" --stat                                    \

	      --function-coverage -h functioncoverage;                              \

	fi;



# The .a file is copied in Darwin because the ar command does not like

#   to extract the same archive twice, regardless of permissions or symlink

unitTest: $(OBJS) unitTest.o

	export PATH="$(CODE_COVERAGE_PATH_DIR):$$PATH"; \

	if [ "$(HOST_ARCH)" == "Linux" ]; then                                        \

	  $(CP) $(ISISROOT)/lib/libisis$(ISISLIBVERSION).a                           \

	      libisis$(ISISLIBVERSION).a;                                            \

	  if [ -f "$(ISISROOT)/lib/libisis$(ISISLIBVERSION).a.csmes" ]; then         \

	    $(CP) $(ISISROOT)/lib/libisis$(ISISLIBVERSION).a.csmes                   \

	      libisis$(ISISLIBVERSION).a.csmes;                                      \

	  fi;                                                                        \

	  $(AR) $(ISISARFLAGS) -crs libisis$(ISISLIBVERSION).a $(OBJS);              \

	  $(RANLIB) libisis$(ISISLIBVERSION).a;                                      \

	    $(AR) $(ISISARFLAGS) -crs $(LIBRARY).a *.o;                               \

	    $(LDSHARED) $(ISISSHAREDFLAGS) $(ISISSHAREDON)                            \

	      -o libisis$(ISISLIBVERSION).$(SHAREDLIBEXT) libisis$(ISISLIBVERSION).a \

	        -o $(LIBRARY).$(SHAREDLIBEXT) $(LIBRARY).a                            \

	        $(ISISSHAREDOFF);                                                     \

	  $(RM) libisis$(ISISLIBVERSION).a libisis$(ISISLIBVERSION).a.csmes;         \

	    $(RM) $(LIBRARY).a $(LIBRARY).a.csmes;                                    \

	    dollar='$$';                                                              \

	    $(CXX) $(ALLLIBDIRS)                                                      \

	        -Xlinker "-rpath"                                                     \

	        -Xlinker "$${dollar}ORIGIN" $(ISISLDFLAGS)                            \

	      -o $@ unitTest.o $(ALLLIBS);                                           \

	        -o $@ unitTest.o -l:$(LIBRARY).$(SHAREDLIBEXT) $(ALLLIBS);            \

	elif [ "$(HOST_ARCH)" == "Darwin" ]; then                                    \

	  $(MKDIR) .objs;                                                            \

	  cd .objs;                                                                  \