Ticket12. The StopOnError parameter is comment out.

[stg.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 56d7d95d2a613ca0d0f19eadb3e7c6a48b080aea..72acdd62cdda79a0207c924fb19eb9dc616c7daf 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,30 +1,59 @@
-CXXFLAGS+=-g3 -Wall -W -pedantic -DLINUX -I../include -I../projects/stargazer -I../stglibs/conffiles.lib
-LIBS=-lpthread
-PROG=tests
+INCS = -I . \
+       -I ../include \
+       -I ../stglibs/common.lib/include \
+       -I ../stglibs/conffiles.lib/include \
+       -I ../stglibs/logger.lib/include \
+       -I ../stglibs/scriptexecuter.lib/include \
+       -I ../stglibs/crypto.lib/include \
+       -I ../projects/stargazer
+DEFS = -DLINUX \
+       -DUSE_ABSTRACT_SETTINGS
+CFLAGS += -g3 -Wall -W -Wextra $(INCS) $(DEFS)
+CXXFLAGS += $(CFLAGS)
+LIBS = -lpthread
+PROG = tests

 
 

-SOURCES=main.cpp \
-       test_raw_ip.cpp \
-       test_admin_conf.cpp \
-       test_tariff.cpp \
-       test_conffiles.cpp \
-       ../projects/stargazer/tariff.cpp \
-       ../stglibs/conffiles.lib/conffiles.cpp
+SOURCES = main.cpp \
+         test_raw_ip.cpp \
+         test_admin_conf.cpp \
+         test_tariff.cpp \
+         test_conffiles.cpp \
+         test_fee_charge_rules.cpp \
+         test_reconnect_on_tariff_change.cpp \
+         test_crypto.cpp \
+         test_bfstream.cpp \
+         ../projects/stargazer/tariff_impl.cpp \
+         ../projects/stargazer/user_impl.cpp \
+         ../projects/stargazer/user_property.cpp \
+         ../stglibs/conffiles.lib/conffiles.cpp \
+         ../stglibs/common.lib/common.cpp \
+         ../stglibs/logger.lib/logger.cpp \
+         ../stglibs/scriptexecuter.lib/scriptexecuter.cpp \
+         ../stglibs/crypto.lib/bfstream.cpp \
+         ../stglibs/crypto.lib/blowfish.c

 
 

-all: $(PROG) 
+.PHONY: all clean

 
 

-$(PROG): $(subst .cpp,.o,$(SOURCES))
+all: $(PROG)
+
+$(PROG): $(addsuffix .o,$(basename $(SOURCES)))

        $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
 
 clean:
        $(CXX) $(LDFLAGS) $^ $(LIBS) -o $@
 
 clean:

-       rm -f *.o *.d
+       rm -f $(addsuffix .o,$(basename $(SOURCES))) $(addsuffix .d,$(SOURCES)) $(PROG)

 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)
 
 ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(MAKECMDGOALS),clean)

--include $(subst .cpp,.d,$(SOURCES))
+-include $(addsuffix .d,$(SOURCES))

 endif
 endif
 
 endif
 endif
 

-%.d: %.cpp
-       @$(CC) -MM $(CXXFLAGS) $< > $@.$$$$; \
+%.cpp.d: %.cpp
+       @$(CXX) -MM $(CXXFLAGS) $< > $@.$$$$; \
+       sed 's,\($*\).o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+       rm -f $@.$$$$
+
+%.c.d: %.c
+       @$(CC) -MM $(CFLAGS) $< > $@.$$$$; \

        sed 's,\($*\).o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
        rm -f $@.$$$$
        sed 's,\($*\).o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
        rm -f $@.$$$$