Changeset 18015 for branches

Timestamp:

11/15/14 03:25:58 (10 years ago)

Author:

smueller

Message:

Google Test, new executeable run_test. From now on gtest is required to build MARS. Makefile was adjusted to build the new run_test executeable and link it with gtest libs. A first test was made for the MMatrix Container. All tests are in a new mtest folder.

Location:

branches/AddingGoogleTestEnvironment

Files:

• Makefile (modified) (4 diffs)
• Makefile.conf.general (modified) (1 diff)
• mtest (added)
• mtest/MMatrixTEST (added)
• mtest/MMatrixTEST/3x3_Matrix.csv (added)
• mtest/MMatrixTEST/LineBreak_CR.csv (added)
• mtest/MMatrixTEST/LineBreak_CR.rc (added)
• mtest/MMatrixTEST/LineBreak_CRLF.csv (added)
• mtest/MMatrixTEST/LineBreak_CRLF.rc (added)
• mtest/MMatrixTEST/MMatrixTEST.cc (added)
• mtest/MMatrixTEST/NaN_Inf_exponent.csv (added)
• mtest/MMatrixTEST/NaN_Inf_exponent.rc (added)
• mtest/MMatrixTEST/bad_floating_point_number.csv (added)
• mtest/MMatrixTEST/bad_floating_point_number.rc (added)
• mtest/MMatrixTEST/comment_only.csv (added)
• mtest/MMatrixTEST/comment_only.rc (added)
• mtest/MMatrixTEST/config_where_the_path_to_MyData_is_defined.rc (added)
• mtest/MMatrixTEST/csv_file_does_not_exist.rc (added)
• mtest/MMatrixTEST/data_and_comments_mixed.csv (added)
• mtest/MMatrixTEST/data_and_comments_mixed.rc (added)
• mtest/MMatrixTEST/data_only.csv (added)
• mtest/MMatrixTEST/data_only.rc (added)
• mtest/MMatrixTEST/key_does_not_exist_in_config_file.rc (added)
• mtest/MMatrixTEST/missing_delimiter.csv (added)
• mtest/MMatrixTEST/missing_delimiter.rc (added)
• mtest/MMatrixTEST/whitespaces_and_tabs.csv (added)
• mtest/MMatrixTEST/whitespaces_and_tabs.rc (added)
• run_tests.cc (added)

branches/AddingGoogleTestEnvironment/Makefile

@@ -21 +21 @@
 #
 #PROGRAMS = readraw merpp mars test mona status
-PROGRAMS := readdaq readraw readcorsika ceres merpp callisto star ganymed sponde showlog showplot mars mars-config
+PROGRAMS := run_tests readdaq readraw readcorsika ceres merpp callisto star ganymed sponde showlog showplot mars mars-config
 SOLIB    := libmars.so
 
@@ -134 +134 @@
 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
         @echo " Linking shared object $@ ..."
-        $(LINKER) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME}
+        $(LINKER) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME} $(GTESTLIBS)
         mv ${RNDMNAME} $@
         chmod go+r $@
@@ -143 +143 @@
 $(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB)
         @echo " Linking $@ ..." 
-        $(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@
+        $(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@ $(GTESTLIBS)
 
 # Use this to link the programs statically - for gprof
@@ -152 +152 @@
 $(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
         @echo " Linking dylib $(DYLIB) ..."
-        $(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+        $(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@ $(GTESTLIBS)
 
 $(PROGRAMS): $(PROGRAMS:=.o) $(DYLIB)
         @echo " Linking mac executable $@ ..." 
-        $(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
+        $(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@ $(GTESTLIBS)
 endif
 

branches/AddingGoogleTestEnvironment/Makefile.conf.general

@@ -6 +6 @@
 ROOTGLIBS  := $(shell root-config --glibs) -lASImage -lMinuit -lHistPainter -lThread
 ROOTCFLAGS := $(shell root-config --cflags)
+GTESTLIBS  := -lgtest -lpthread
 
 SVN_REVISION := -DREVISION=\"$(shell svnversion -n .)\"