Skip to content
Snippets Groups Projects
Commit 95d3c604 authored by Axel Naumann's avatar Axel Naumann
Browse files

Don't let check-reflex pollute $ROOTSYS/lib/ with test libraries; put them...

Don't let check-reflex pollute $ROOTSYS/lib/ with test libraries; put them into reflex/test/lib instead.
Make sure that ALL tests finish successfully for check-reflex to be successful!


git-svn-id: http://root.cern.ch/svn/root/trunk@20655 27541ba8-7e3a-0410-8455-c3a389f83636
parent e44a3c69
Branches
Tags
No related merge requests found
...@@ -80,13 +80,14 @@ RFLX_REFLEXLL += -ldemangle ...@@ -80,13 +80,14 @@ RFLX_REFLEXLL += -ldemangle
endif endif
RFLX_TESTD = $(REFLEXDIR)/test RFLX_TESTD = $(REFLEXDIR)/test
RFLX_TESTDL = $(RFLX_TESTD)/lib
RFLX_TESTLIBD1 = $(RFLX_TESTD)/testDict1 RFLX_TESTLIBD1 = $(RFLX_TESTD)/testDict1
RFLX_TESTLIBD2 = $(RFLX_TESTD)/testDict2 RFLX_TESTLIBD2 = $(RFLX_TESTD)/testDict2
RFLX_TESTLIBS1 = $(RFLX_TESTD)/Reflex_rflx.cpp RFLX_TESTLIBS1 = $(RFLX_TESTD)/Reflex_rflx.cpp
RFLX_TESTLIBS2 = $(RFLX_TESTD)/Class2Dict_rflx.cpp RFLX_TESTLIBS2 = $(RFLX_TESTD)/Class2Dict_rflx.cpp
RFLX_TESTLIBS = $(RFLX_TESTLIBS1) $(RFLX_TESTLIBS2) RFLX_TESTLIBS = $(RFLX_TESTLIBS1) $(RFLX_TESTLIBS2)
RFLX_TESTLIBO = $(subst .cpp,.o,$(RFLX_TESTLIBS)) RFLX_TESTLIBO = $(subst .cpp,.o,$(RFLX_TESTLIBS))
RFLX_TESTLIB = $(subst $(RFLX_TESTD)/,lib/libtest_,$(subst _rflx.o,Rflx.$(SOEXT),$(RFLX_TESTLIBO))) RFLX_TESTLIB = $(subst $(RFLX_TESTD)/,$(RFLX_TESTDL)/libtest_,$(subst _rflx.o,Rflx.$(SOEXT),$(RFLX_TESTLIBO)))
RFLX_UNITTESTS = $(RFLX_TESTD)/test_Reflex_generate.cxx \ RFLX_UNITTESTS = $(RFLX_TESTD)/test_Reflex_generate.cxx \
$(RFLX_TESTD)/test_ReflexBuilder_unit.cxx \ $(RFLX_TESTD)/test_ReflexBuilder_unit.cxx \
...@@ -181,22 +182,23 @@ distclean:: distclean-reflex ...@@ -181,22 +182,23 @@ distclean:: distclean-reflex
check-reflex: $(REFLEXLIB) $(RFLX_TESTLIB) $(RFLX_UNITTESTX) check-reflex: $(REFLEXLIB) $(RFLX_TESTLIB) $(RFLX_UNITTESTX)
ifeq ($(PLATFORM),win32) ifeq ($(PLATFORM),win32)
@export PATH="`pwd`/bin:$(CPPUNIT)/lib:$(PATH)"; \ @export PATH="$(RFLX_TESTDL):`pwd`/bin:$(CPPUNIT)/lib:$(PATH)"; \
$(RFLX_TESTD)/test_Reflex_generate; \ $(RFLX_TESTD)/test_Reflex_generate && \
$(RFLX_TESTD)/test_Reflex_simple1; \ $(RFLX_TESTD)/test_Reflex_simple1 && \
$(RFLX_TESTD)/test_Reflex_simple2; \ $(RFLX_TESTD)/test_Reflex_simple2 && \
$(RFLX_TESTD)/test_Reflex_unit; \ $(RFLX_TESTD)/test_Reflex_unit && \
$(RFLX_TESTD)/test_ReflexBuilder_unit $(RFLX_TESTD)/test_ReflexBuilder_unit
else else
@export LD_LIBRARY_PATH=`pwd`/lib:$(CPPUNIT)/lib; \ @export LD_LIBRARY_PATH=$(RFLX_TESTDL):`pwd`/lib:$(CPPUNIT)/lib; \
$(RFLX_TESTD)/test_Reflex_generate; \ $(RFLX_TESTD)/test_Reflex_generate && \
$(RFLX_TESTD)/test_Reflex_simple1; \ $(RFLX_TESTD)/test_Reflex_simple1 && \
$(RFLX_TESTD)/test_Reflex_simple2; \ $(RFLX_TESTD)/test_Reflex_simple2 && \
$(RFLX_TESTD)/test_Reflex_unit; \ $(RFLX_TESTD)/test_Reflex_unit && \
$(RFLX_TESTD)/test_ReflexBuilder_unit $(RFLX_TESTD)/test_ReflexBuilder_unit
endif endif
lib/libtest_%Rflx.$(SOEXT) : $(RFLX_TESTD)/%_rflx.o $(RFLX_TESTDL)/libtest_%Rflx.$(SOEXT) : $(RFLX_TESTD)/%_rflx.o
@mkdir -p $(dir $@)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" "$(SOFLAGS)" $(notdir $@) $@ $< $(RFLX_REFLEXLL) @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" "$(SOFLAGS)" $(notdir $@) $@ $< $(RFLX_REFLEXLL)
%_rflx.o : %_rflx.cpp %_rflx.o : %_rflx.cpp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment