[Xorp-cvs] SF.net SVN: xorp:[11625] trunk/xorp/site_scons/site_tools/autotest.py

[bms_fbsd at users.sourceforge.net]

Revision: 11625
          http://xorp.svn.sourceforge.net/xorp/?rev=11625&view=rev
Author:   bms_fbsd
Date:     2009-11-28 23:37:15 +0000 (Sat, 28 Nov 2009)

Log Message:
-----------
Remove ORIGIN magic from the AutoTest() builder, as test
binaries are never installed outside of the $BUILDDIR.

Modified Paths:
--------------
    trunk/xorp/site_scons/site_tools/autotest.py

Modified: trunk/xorp/site_scons/site_tools/autotest.py
===================================================================
--- trunk/xorp/site_scons/site_tools/autotest.py	2009-11-27 09:17:16 UTC (rev 11624)
+++ trunk/xorp/site_scons/site_tools/autotest.py	2009-11-28 23:37:15 UTC (rev 11625)
@@ -64,23 +64,15 @@
     rpath  = Split( multiget([kwargs, env], 'RPATH'))
     linkflags  = Split( multiget([kwargs, env], 'LINKFLAGS'))
 
-    myrpath = rpath
-
     # For a test, take the our passed in LIBPATH, expand it, and prepend
     # to our passed in RPATH, so that tests can build using shared
     # libraries, even though they are not installed.
+    # Tests are not intended to be installed, so we don't do any
+    # further RPATH magic here.
+    myrpath = rpath
     if env.has_key('SHAREDLIBS'):
-        # Figure out our absolute BUILDDIR path. If we're not using
-        # ORIGIN, then the test can be run
-        my_rpath_base = Dir(env['BUILDDIR']).abspath
-        # If ORIGIN is enabled, figure out our test's path relative
-        # to the BUILDDIR, and pass that to the linker in RPATH.
-        # XXX: Perhaps we should set '-z origin' at the top level?
-        #if env['use_rtld_origin']:
-        #    env.PrependUnique( LINKFLAGS = Split('-z origin') )
-        #    my_rpath_base = os.path.relpath(my_rpath_base, Dir('.').abspath)
-        # Expand the RPATH according to destdir layout.
-        myrpath += [ x.replace('$BUILDDIR', my_rpath_base) for x in libpath ]
+        baserpath = Dir(env['BUILDDIR']).abspath
+        myrpath += [ x.replace('$BUILDDIR', baserpath) for x in libpath ]
 
     # fill the flags into kwargs
     kwargs["CXXFLAGS"] = cxxflags


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.