import 15.2.0 Octopus source

[ceph.git] / ceph / src / seastar / test.py

diff --git a/ceph/src/seastar/test.py b/ceph/src/seastar/test.py
index d5c7b279c05aaa8661026b6ad6deb846c115d2a5..162da15ca7d7cc251666871c3ee6302521603ff6 100755 (executable)
--- a/ceph/src/seastar/test.py
+++ b/ceph/src/seastar/test.py
@@ -29,6 +29,7 @@ if __name__ == "__main__":
     parser.add_argument('--mode', choices=seastar_cmake.SUPPORTED_MODES, help="Run only tests for given build mode")
     parser.add_argument('--timeout', action="store",default="300",type=int, help="timeout value for test execution")
     parser.add_argument('--jenkins', action="store",help="jenkins output file prefix")
+    parser.add_argument('--smp', '-c', action="store",default='2',type=int,help="Number of threads for multi-core tests")
     parser.add_argument('--verbose', '-v', action = 'store_true', default = False,
                         help = 'Verbose reporting')
     args = parser.parse_args()
@@ -44,6 +45,7 @@ if __name__ == "__main__":
         TRANSLATED_CMAKE_ARGS = [
             tr(args.timeout, 'TEST_TIMEOUT'),
             tr(args.fast, 'EXECUTE_ONLY_FAST_TESTS'),
+            tr(args.smp, 'UNIT_TEST_SMP'),
             tr(args.jenkins, 'JENKINS', value_when_none=''),
         ]
 
@@ -52,7 +54,7 @@ if __name__ == "__main__":
         print(CMAKE_ARGS)
         subprocess.check_call(CMAKE_ARGS, shell=False, cwd=seastar_cmake.ROOT_PATH)
 
-        TRANSLATED_CTEST_ARGS = ['-E', 'Seastar.dist']
+        TRANSLATED_CTEST_ARGS = ['--output-on-failure']
         if args.verbose:
             TRANSLATED_CTEST_ARGS += ['--verbose']
         if args.name: