1 files changed, 8 insertions, 0 deletions
diff --git a/vsperf b/vsperf
index 4b1d86d0..71ca2eb0 100755
--- a/vsperf
+++ b/vsperf
@@ -154,6 +154,7 @@ def parse_arguments():
             name contains RFC2544 less those containing "p2p"')
     group.add_argument('--verbosity', choices=list_logging_levels(),
                        help='debug level')
+    group.add_argument('--run-integration', action='store_true', help='run integration tests')
     group.add_argument('--trafficgen', help='traffic generator to use')
     group.add_argument('--vswitch', help='vswitch implementation to use')
     group.add_argument('--fwdapp', help='packet forwarding application to use')
@@ -325,6 +326,10 @@ def main():
 
     settings.load_from_dir('conf')
 
+    # Load non performance/integration tests
+    if args['run_integration']:
+        settings.load_from_dir('conf/integration')
+
     # load command line parameters first in case there are settings files
     # to be used
     settings.load_from_dict(args)
@@ -455,6 +460,9 @@ def main():
     else:
         # configure tests
         testcases = settings.getValue('PERFORMANCE_TESTS')
+        if args['run_integration']:
+            testcases = settings.getValue('INTEGRATION_TESTS')
+
         all_tests = []
         for cfg in testcases:
             try: