[Xorp-cvs] SF.net SVN: xorp:[11636] trunk/xorp/libxipc/tests/SConscript

bms_fbsd at users.sourceforge.net bms_fbsd at users.sourceforge.net
Sat Nov 28 19:58:36 PST 2009


Revision: 11636
          http://xorp.svn.sourceforge.net/xorp/?rev=11636&view=rev
Author:   bms_fbsd
Date:     2009-11-29 03:58:36 +0000 (Sun, 29 Nov 2009)

Log Message:
-----------
Build test_xrl_router as a simple test, and run it with the others.

Correct the RPATH for test_xrl_router/test_xrl_sender.

Modified Paths:
--------------
    trunk/xorp/libxipc/tests/SConscript

Modified: trunk/xorp/libxipc/tests/SConscript
===================================================================
--- trunk/xorp/libxipc/tests/SConscript	2009-11-29 03:57:49 UTC (rev 11635)
+++ trunk/xorp/libxipc/tests/SConscript	2009-11-29 03:58:36 UTC (rev 11636)
@@ -67,7 +67,7 @@
 	'xrl_atom',
 	'xrl_error',
 	'xrl_parser',
-	#'xrl_router',		# uses XrlPFUDP*
+	'xrl_router',
 ]
 
 cpp_test_targets = []
@@ -76,10 +76,19 @@
     cpp_test_targets.append(env.AutoTest(target = 'test_%s' % ct,
                                          source = 'test_%s.cc' % ct))
 
+# XXX Now to run them.
+
 ### test_xrl_sender/receiver
 
 env = env.Clone()
 
+def local_rpath(tenv):
+    """ Return tenv's RPATH munged to contain absolute build path. """
+    return [ x.replace('$BUILDDIR', Dir(tenv['BUILDDIR']).abspath) \
+             for x in tenv['LIBPATH'] ]
+
+env['RPATH'] += local_rpath(env)
+
 env.PrependUnique(LIBS = [
 	'xif_test_xrls',
 	'xst_test_xrls',
@@ -100,6 +109,7 @@
 test_xrl_sender_srcs = [ 'test_xrl_sender.cc', test_receiver_o ]
 test_xrl_sender = env.Program(target = 'test_xrl_sender',
 			      source = test_xrl_sender_srcs)
+
 # XXX Build on 'check', but don't run.
 env.Alias('check', test_xrl_sender)
 


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



More information about the Xorp-cvs mailing list