bgp: Fix build when profiling is disabled. Fix typo in test_busted sc…

…ript. Signed-off-by: Ben Greear <greearb@candelatech.com>
greearb · Jun 21, 2010 · 5787fe8 · 5787fe8
1 parent 8564e5b
commit 5787fe8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/xorp/bgp/harness/SConscript b/xorp/bgp/harness/SConscript
@@ -60,10 +60,14 @@ env.AppendUnique(LIBS = [
     'xif_fea_ifmgr_replicator',
     'xst_fea_ifmgr_mirror',
     'xst_bgp',
-    'xif_profile_client',
     'xif_finder_event_notifier',
     ])
 
+if not (env.has_key('disable_profile') and env['disable_profile']):
+    env.AppendUnique(LIBS = [
+        'xif_profile_client',
+        ])
+
 coord_srcs = [
     'bgppp.cc',
     'command.cc',

diff --git a/xorp/bgp/harness/test_busted b/xorp/bgp/harness/test_busted
@@ -42,7 +42,7 @@ sub fork_sys {
     }
     # There should be no test_peer processes running now, kill them if they
     # exist.
-    print "Killing any existing test_peer processes, child pid: $pid"
+    print "Killing any existing test_peer processes, child pid: $pid";
     print `ps auxwww|grep test_peer`;
     print "\n";
     system("killall -s 9 -r runit");

diff --git a/xorp/bgp/tools/SConscript b/xorp/bgp/tools/SConscript
@@ -54,10 +54,15 @@ env.AppendUnique(LIBS = [
     'xst_fea_ifmgr_mirror',
     'xif_fea_ifmgr_replicator',
     'xst_bgp',
-    'xif_profile_client',
     'xif_finder_event_notifier',
     ])
 
+if not (env.has_key('disable_profile') and env['disable_profile']):
+    env.AppendUnique(LIBS = [
+        'xif_profile_client',
+        ])
+
+
 env.Replace(RPATH = [
     env.Literal(env['xorp_tool_rpath'])
 ])