Commit f8883db8 authored by Andrea Bulgarelli's avatar Andrea Bulgarelli
Browse files

issues on conf files for test unit

parent fc065ecf

Makefile

+10 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ SHELL = /bin/sh 
####### 1) Project names and system



#SYSTEM: linux or QNX

SYSTEM = linux

SYSTEM= $(shell gcc -dumpmachine)

PROJECT=PacketLib

EXE_NAME = main

LIB_NAME = libpacket
@@ -76,6 +76,13 @@ LIBS = -lstdc++ 
ifeq ($(SYSTEM), QNX)

	LIBS += -lsocket

endif

BOOST_LIBNAME = -lboost_unit_test_framework

ifneq (, $(findstring apple, $(SYSTEM)))

 	# Do apple things

	CPPFLAGS += -I$(LOCAL)/include

	LIBS += -L$(LOCAL)/lib

endif 



LINK     = g++

#for link

LFLAGS = -shared -Wl,-soname,$(TARGET1) -Wl,-rpath,$(DESTDIR)
@@ -128,7 +135,7 @@ test/%.o : test/%.cpp 
	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $@



test/%: test/%.o lib

	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< -lboost_unit_test_framework -Llib -lpacket

	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $< $(BOOST_LIBNAME) -Llib -lpacket $(LIBS)



%.o : %.cpp

	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -c $< -o $(OBJECTS_DIR)/$@

test/39_01.packet

+1 −0
Original line number Diff line number Diff line
@@ -247,3 +247,4 @@ variable 
CRC

16

none

test/39_01_GRIDEvent.rblock

+1 −0
Original line number Diff line number Diff line
@@ -174,3 +174,4 @@ variable 
-- for variable block, valore da sommare per ottenere il numero di eventi (blocchi) reali

/0

39_01_TAA1_Triggered.rblock

test/39_01_MCAL_ZeroSuppressed.rblock

+2 −1
Original line number Diff line number Diff line
@@ -24,3 +24,4 @@ none 
Energy Side A

12

none

test/39_01_ST_Cluster.rblock

+1 −0
Original line number Diff line number Diff line
@@ -52,3 +52,4 @@ none 
Right strip charge (central strip + 2) (XSTRIPC5)

8

none