From d6a6d469e05b08f81292e4cee8772290957f38bb Mon Sep 17 00:00:00 2001 From: Ananth Suryanarayana Date: Mon, 2 Nov 2015 00:01:32 -0800 Subject: [PATCH] Stablize bgp unit tests in ubuntu trusty Move some of the long running tests to non gperf mode in order to get better performance and stability Change-Id: I0815a236dd8171d94d283a5b817e01b47ab89207 Partial-Bug: #1464121 --- ci_unittests.json | 29 ++++++++++++++- src/bgp/inet6/test/SConscript | 4 +- src/bgp/inet6vpn/test/SConscript | 3 +- src/bgp/l3vpn/test/SConscript | 6 +-- src/bgp/test/SConscript | 64 ++++++++++++-------------------- 5 files changed, 55 insertions(+), 51 deletions(-) diff --git a/ci_unittests.json b/ci_unittests.json index 5ad5df1d997..31788cf6e1b 100644 --- a/ci_unittests.json +++ b/ci_unittests.json @@ -43,7 +43,34 @@ "controller/src/ifmap:test", "controller/src/xmpp:test" ], - "misc_test_targets" : [ ] + "misc_test_targets" : [ ], + "environment" : [ + { + "tuples" : [ + "NO_HEAPCHECK=TRUE", + "LOG_DISABLE=TRUE" + ], + "tests" : [ + ".*/bgp/l3vpn/test/inetvpn_peer_test$", + ".*/bgp/test/bgp_evpn_manager_test$", + ".*/bgp/test/bgp_server_test$", + ".*/bgp/test/bgp_show_neighbor_test$", + ".*/bgp/test/bgp_show_evpn_table_test$", + ".*/bgp/test/bgp_show_route_summary_test$", + ".*/bgp/test/bgp_show_routing_instance_test$", + ".*/bgp/test/bgp_show_rtarget_group_test$", + ".*/bgp/test/bgp_xmpp_basic_test$", + ".*/bgp/test/bgp_xmpp_evpn_mcast_test$", + ".*/bgp/test/bgp_xmpp_inetvpn_test$", + ".*/bgp/test/bgp_xmpp_inet6vpn_test$", + ".*/bgp/test/bgp_xmpp_mcast_test$", + ".*/bgp/test/bgp_xmpp_rtarget_test$", + ".*/bgp/test/service_chain_test", + ".*/bgp/test/svc_static_route_intergration_test", + ".*/bgp/test/xmpp_ecmp_test$" + ] + } + ] }, "contrail-vrouter" : { "source_directories" : [ diff --git a/src/bgp/inet6/test/SConscript b/src/bgp/inet6/test/SConscript index 61430997718..1f52e23d5ee 100644 --- a/src/bgp/inet6/test/SConscript +++ b/src/bgp/inet6/test/SConscript @@ -120,9 +120,7 @@ inet6_route_test = env.UnitTest('inet6_route_test', ['inet6_route_test.cc']) env.Alias('src/bgp/inet6:inet6_route_test', inet6_route_test) env.Alias('controller/src/bgp/inet6:inet6_route_test', inet6_route_test) -inet6_table_test = env.UnitTest('inet6_table_test', - ['inet6_table_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) +inet6_table_test = env.UnitTest('inet6_table_test', ['inet6_table_test.cc']) env.Alias('src/bgp/inet6:inet6_table_test', inet6_table_test) test_suite = [ diff --git a/src/bgp/inet6vpn/test/SConscript b/src/bgp/inet6vpn/test/SConscript index 27164d23d0a..f68c9ea8937 100644 --- a/src/bgp/inet6vpn/test/SConscript +++ b/src/bgp/inet6vpn/test/SConscript @@ -127,8 +127,7 @@ env.Alias('controller/src/bgp/inet6vpn:inet6vpn_route_test', inet6vpn_route_test) inet6vpn_table_test = env.UnitTest('inet6vpn_table_test', - ['inet6vpn_table_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) + ['inet6vpn_table_test.cc']) env.Alias('src/bgp/inet6vpn:inet6vpn_table_test', inet6vpn_table_test) env.Alias('controller/src/bgp/inet6vpn:inet6vpn_table_test', inet6vpn_table_test) diff --git a/src/bgp/l3vpn/test/SConscript b/src/bgp/l3vpn/test/SConscript index 497abb52ede..e06b98042bf 100644 --- a/src/bgp/l3vpn/test/SConscript +++ b/src/bgp/l3vpn/test/SConscript @@ -114,13 +114,11 @@ else: env.Append(LIBS = ['bgp_inet']) inetvpn_ext_peer_test = env.UnitTest('inetvpn_ext_peer_test', - ['inetvpn_ext_peer_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) + ['inetvpn_ext_peer_test.cc']) env.Alias('src/bgp/l3vpn:inetvpn_ext_peer_test', inetvpn_ext_peer_test) inetvpn_peer_test = env.UnitTest('inetvpn_peer_test', - ['inetvpn_peer_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) + ['inetvpn_peer_test.cc']) env.Alias('src/bgp/l3vpn:inetvpn_peer_test', inetvpn_peer_test) inetvpn_route_test = env.UnitTest('inetvpn_route_test', diff --git a/src/bgp/test/SConscript b/src/bgp/test/SConscript index d7ed0a1c431..ff87a078156 100644 --- a/src/bgp/test/SConscript +++ b/src/bgp/test/SConscript @@ -209,8 +209,7 @@ bgp_route_test = env.UnitTest('bgp_route_test', env.Alias('src/bgp:bgp_route_test', bgp_route_test) bgp_server_test = env.UnitTest('bgp_server_test', - ['bgp_server_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) + ['bgp_server_test.cc']) env.Alias('src/bgp:bgp_server_test', bgp_server_test) bgp_session_test = env.UnitTest('bgp_session_test', @@ -222,56 +221,46 @@ bgp_sg_test = env.UnitTest('bgp_sg_test', env.Alias('src/bgp:bgp_sg_test', bgp_sg_test) bgp_show_evpn_table_test = env.UnitTest('bgp_show_evpn_table_test', - ['bgp_show_evpn_table_test.cc']) -env.Alias('src/bgp:bgp_show_evpn_table_test', - bgp_show_evpn_table_test) + ['bgp_show_evpn_table_test.cc']) +env.Alias('src/bgp:bgp_show_evpn_table_test', bgp_show_evpn_table_test) bgp_show_instance_config_test = env.UnitTest('bgp_show_instance_config_test', - ['bgp_show_instance_config_test.cc']) + ['bgp_show_instance_config_test.cc']) env.Alias('src/bgp:bgp_show_instance_config_test', - bgp_show_instance_config_test) + bgp_show_instance_config_test) bgp_show_multicast_manager_test = env.UnitTest( 'bgp_show_multicast_manager_test', ['bgp_show_multicast_manager_test.cc']) env.Alias('src/bgp:bgp_show_multicast_manager_test', - bgp_show_multicast_manager_test) + bgp_show_multicast_manager_test) bgp_show_neighbor_test = env.UnitTest('bgp_show_neighbor_test', - ['bgp_show_neighbor_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) -env.Alias('src/bgp:bgp_show_neighbor_test', - bgp_show_neighbor_test) + ['bgp_show_neighbor_test.cc']) +env.Alias('src/bgp:bgp_show_neighbor_test', bgp_show_neighbor_test) bgp_show_route_summary_test = env.UnitTest('bgp_show_route_summary_test', - ['bgp_show_route_summary_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) -env.Alias('src/bgp:bgp_show_route_summary_test', - bgp_show_route_summary_test) + ['bgp_show_route_summary_test.cc']) +env.Alias('src/bgp:bgp_show_route_summary_test', bgp_show_route_summary_test) bgp_show_routing_instance_test = env.UnitTest('bgp_show_routing_instance_test', ['bgp_show_routing_instance_test.cc']) -env.Alias('src/bgp:bgp_show_routing_instance_test', - bgp_show_routing_instance_test) +env.Alias('src/bgp:bgp_show_routing_instance_test', bgp_show_routing_instance_test) bgp_show_rtarget_group_test = env.UnitTest('bgp_show_rtarget_group_test', - ['bgp_show_rtarget_group_test.cc']) -env.Alias('src/bgp:bgp_show_rtarget_group_test', - bgp_show_rtarget_group_test) + ['bgp_show_rtarget_group_test.cc']) +env.Alias('src/bgp:bgp_show_rtarget_group_test', bgp_show_rtarget_group_test) -bgp_stress_test = env.UnitTest('bgp_stress_test', - ['bgp_stress_test.cc']) +bgp_stress_test = env.UnitTest('bgp_stress_test', ['bgp_stress_test.cc']) env.Alias('src/bgp:bgp_stress_test', bgp_stress_test) bgp_table_export_test = env.UnitTest('bgp_table_export_test', ['bgp_table_export_test.cc']) env.Alias('src/bgp:bgp_table_export_test', bgp_table_export_test) -bgp_table_test = env.UnitTest('bgp_table_test', - ['bgp_table_test.cc']) +bgp_table_test = env.UnitTest('bgp_table_test', ['bgp_table_test.cc']) env.Alias('src/bgp:bgp_table_test', bgp_table_test) -bgp_update_rx_test = env.UnitTest('bgp_update_rx_test', - ['bgp_update_rx_test.cc']) +bgp_update_rx_test = env.UnitTest('bgp_update_rx_test', ['bgp_update_rx_test.cc']) env.Alias('src/bgp:bgp_update_rx_test', bgp_update_rx_test) bgp_update_test = env.UnitTest('bgp_update_test', @@ -279,8 +268,7 @@ bgp_update_test = env.UnitTest('bgp_update_test', env.Alias('src/bgp:bgp_update_test', bgp_update_test) bgp_xmpp_basic_test = env.UnitTest('bgp_xmpp_basic_test', - ['bgp_xmpp_basic_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) + ['bgp_xmpp_basic_test.cc']) env.Alias('src/bgp:bgp_xmpp_basic_test', bgp_xmpp_basic_test) bgp_xmpp_channel_test = env.UnitTest('bgp_xmpp_channel_test', @@ -292,13 +280,11 @@ bgp_xmpp_deferq_test = env.UnitTest('bgp_xmpp_deferq_test', env.Alias('src/bgp:bgp_xmpp_deferq_test', bgp_xmpp_deferq_test) bgp_xmpp_inetvpn_test = env.UnitTest('bgp_xmpp_inetvpn_test', - ['bgp_xmpp_inetvpn_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) + ['bgp_xmpp_inetvpn_test.cc']) env.Alias('src/bgp:bgp_xmpp_inetvpn_test', bgp_xmpp_inetvpn_test) bgp_xmpp_evpn_mcast_test = env.UnitTest('bgp_xmpp_evpn_mcast_test', - ['bgp_xmpp_evpn_mcast_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) + ['bgp_xmpp_evpn_mcast_test.cc']) env.Alias('src/bgp:bgp_xmpp_evpn_mcast_test', bgp_xmpp_evpn_mcast_test) bgp_xmpp_evpn_test = env.UnitTest('bgp_xmpp_evpn_test', @@ -311,8 +297,7 @@ env.Alias('controller/src/bgp:bgp_xmpp_inet6vpn_test', bgp_xmpp_inet6vpn_test) env.Alias('src/bgp:bgp_xmpp_inet6vpn_test', bgp_xmpp_inet6vpn_test) bgp_xmpp_mcast_test = env.UnitTest('bgp_xmpp_mcast_test', - ['bgp_xmpp_mcast_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) + ['bgp_xmpp_mcast_test.cc']) env.Alias('src/bgp:bgp_xmpp_mcast_test', bgp_xmpp_mcast_test) bgp_xmpp_parse_test = env.UnitTest('bgp_xmpp_parse_test', @@ -320,8 +305,7 @@ bgp_xmpp_parse_test = env.UnitTest('bgp_xmpp_parse_test', env.Alias('src/bgp:bgp_xmpp_parse_test', bgp_xmpp_parse_test) bgp_xmpp_rtarget_test = env.UnitTest('bgp_xmpp_rtarget_test', - ['bgp_xmpp_rtarget_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) + ['bgp_xmpp_rtarget_test.cc']) env.Alias('src/bgp:bgp_xmpp_rtarget_test', bgp_xmpp_rtarget_test) bgp_xmpp_test = env.UnitTest('bgp_xmpp_test', @@ -356,8 +340,7 @@ rt_network_attr_test = env.UnitTest('rt_network_attr_test', ['rt_network_attr_test.cc']) env.Alias('src/bgp:rt_network_attr_test', rt_network_attr_test) -xmpp_ecmp_test = env.UnitTest('xmpp_ecmp_test', ['xmpp_ecmp_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) +xmpp_ecmp_test = env.UnitTest('xmpp_ecmp_test', ['xmpp_ecmp_test.cc']) env.Alias('src/bgp:xmpp_ecmp_test', xmpp_ecmp_test) rt_unicast_test = env.UnitTest('rt_unicast_test', @@ -373,8 +356,7 @@ service_chain_test = env.UnitTest('service_chain_test', env.Alias('src/bgp:service_chain_test', service_chain_test) svc_static_route_intergration_test = env.UnitTest('svc_static_route_intergration_test', - ['svc_static_route_intergration_test.cc'], - platform_exclude=[('Ubuntu','14.04')]) + ['svc_static_route_intergration_test.cc']) env.Alias('src/bgp:svc_static_route_intergration_test', svc_static_route_intergration_test) show_route_test = env.UnitTest('show_route_test',