Skip to content
Snippets Groups Projects
Commit 35d5ca6c authored by Lorenzo Moneta's avatar Lorenzo Moneta
Browse files

- add test for bug 35076

- fix problem building dictionary library for testIO


git-svn-id: http://root.cern.ch/svn/root/trunk@22918 27541ba8-7e3a-0410-8455-c3a389f83636
parent 7cefcbc5
No related branches found
No related tags found
No related merge requests found
......@@ -122,30 +122,25 @@ endif
libTrackDict.$(DllSuf): TrackDict.$(ObjSuf)
ifeq ($(ARCH),aix)
/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(GLIBS) -p 0 $^
/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
else
ifeq ($(ARCH),aix5)
/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(GLIBS) -p 0 $^
/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
else
ifeq ($(PLATFORM),macosx)
# We need to make both the .dylib and the .so
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
ifeq ($(MACOSX_MINOR),4)
ln -sf $@ $(subst .$(DllSuf),.so,$@)
else
$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ \
$(OutPutOpt) $(subst .$(DllSuf),.so,$@)
endif
else
ifeq ($(PLATFORM),win32)
bindexplib libTrackDict $^ > libTrackDict.def
lib -nologo -MACHINE:IX86 $^ -def:$*.def \
$(OutPutOpt)libTrackDict.lib
$(LD) $(SOFLAGS) $(LDFLAGS) $^ libTrackDict.exp $(LIBS) \
$(OutPutOpt)$@
else
$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt)$@
endif
else
$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(LIBS) $(OutPutOpt)$@
$(MT_DLL)
endif
endif
endif
......
......@@ -1193,6 +1193,26 @@ int test20() {
m1 *= m1 * m2;
iret |= compare(m1==m3,true);
// test operation involving 2 expressions
// (check bug 35076)
SMatrix<double,2> m4;
SMatrix<double,2> m5;
m4 = (m1*m2) + (m1*m3);
m5 = m1*m2;
m5 += m1*m3;
iret |= compare(m4==m5,true);
m4 = (m1*m2) - (m1*m3);
m5 = m1*m2;
m5 -= m1*m3;
iret |= compare(m4==m5,true);
m4 = (m1+m2) * (m1-m3);
m5 = m1+m2;
m5 = m5 * (m1-m3);
iret |= compare(m4==m5,true);
// test with vectors
SVector<double,4> v1(d1,4);
SVector<double,4 > v2(d2,4);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment