Revision: 7056 http://ipcop.svn.sourceforge.net/ipcop/?rev=7056&view=rev Author: gespinasse Date: 2013-06-02 20:32:25 +0000 (Sun, 02 Jun 2013) Log Message: ----------- Fix another linking issue in the test suite Disable udp gssrpc test, that fail and upstream removed that test.
Modified Paths: -------------- ipcop/trunk/lfs/krb5 Modified: ipcop/trunk/lfs/krb5 =================================================================== --- ipcop/trunk/lfs/krb5 2013-06-02 18:12:57 UTC (rev 7055) +++ ipcop/trunk/lfs/krb5 2013-06-02 20:32:25 UTC (rev 7056) @@ -86,12 +86,14 @@ cd $(DIR_SRC) && tar zxf $(THISAPP).tar.gz && rm $(THISAPP).tar.gz* # Using --with-crypto-impl=openssl show this make check issue /usr/bin/ld: t_fortuna.o: undefined reference to symbol 'AES_set_encrypt_key' - # Adding LIBS fix the issue. + # Adding LIBS fix the issue, accepted upstream (for 1.12) cd $(DIR_APP) && sed -i 's/o t_fortuna t_fortuna.o .*/& $$(LIBS)/' lib/crypto/krb/Makefile.in + # Fix ld: warning libkrb5support.so.0, needed by ../libdb.so, not found, accepted upstream (for 1.12) + cd $(DIR_APP) && sed -i 's/^DB_LIB.*/& -lkrb5support/' plugins/kdb/db2/libdb2/test/Makefile.in - # Hack : disable -Werror=uninitialized or build fail - # Probably gcc-4.4 is less smart than later versions for uninitialized matter - cd $(DIR_APP) && sed -i 's/ error=uninitialized //' configure + # Hack : disable -Werror=uninitialized or build fail, probably gcc-4.4 is less smart than later versions for uninitialized matter + # Skip rpc udp tests that fail on kernel 3.2 or higher, upstream does the same (commit 11bd102c0e3793204111f712e5bd4bf54f2d9573) + cd $(DIR_APP) && sed -i -e 's/ error=uninitialized //' -e 's/PASS="tcp udp"/PASS="tcp"/' configure # gcc-4.4 don't know about #pragma GCC diagnostic push/pop and warn during compilation. # gcc-4.6 is required for that push/pop feature. @@ -102,7 +104,6 @@ -e 's/^#pragma GCC diagnostic pop/#pragma GCC diagnostic error "-Wuninitialized"/g' \ -e '/Wmaybe-uninitialized/d' lib/krb5/krb/{x-deltat.y,deltat.c} - # Fix no previous prototype for 'k5_getcurtime', file disappear in master branch cd $(DIR_APP) && sed -i 's/#include "cm.h"/#include "os-proto.h"\n&/' lib/krb5/os/cm.c @@ -113,7 +114,7 @@ cd $(DIR_APP) && sed -i '$$!N;s/^bool_t\nxdr_uint16_t/static &/;P;D' lib/kdb/iprop_xdr.c cd $(DIR_APP) && sed -i '$$!N;s/^bool_t\nxdr_uint32_t/static &/;P;D' lib/kdb/iprop_xdr.c - # Fix initialization discards qualifiers from pointer target type, accepted upstream + # Fix initialization discards qualifiers from pointer target type, accepted upstream (for 1.12) cd $(DIR_APP) && sed -i 's/ krb5_crypto_iov/ const krb5_crypto_iov/' lib/crypto/openssl/hmac.c # Don't care that much about libverto that may be used too on a more recent glib. @@ -130,10 +131,9 @@ cd $(DIR_APP) && make -j $(PARALLELISM) ifeq "$(RUNNING_TEST)" "yes" - # Tests work fine most of the time on 2.6.32 kernel - # but src/lib/rpc/unit-test/rpc_test.0/expire.exp fail on udp with linux-3.2 or more recent kernel - # Some tests may still fail due to IPv6 host state - # des : kprop test fail if host is not connected to internet + # Tests work fine if not offline + # des : kprop test fail if host if offline + # ./t_iprop.py test stall if offline -cd $(DIR_APP) && make -k check &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log # Some files may remain after tests @rm -rf /var/tmp/* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite It's a free troubleshooting tool designed for production Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap2 _______________________________________________ Ipcop-svn mailing list Ipcop-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ipcop-svn