update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rocksdb / buckifier / buckify_rocksdb.py

diff --git a/ceph/src/rocksdb/buckifier/buckify_rocksdb.py b/ceph/src/rocksdb/buckifier/buckify_rocksdb.py
index d31ffe346376877a00546a9d497236ae8ab7fc22..96903af682f261bd2b807f7d577d9d7708e281e8 100644 (file)
--- a/ceph/src/rocksdb/buckifier/buckify_rocksdb.py
+++ b/ceph/src/rocksdb/buckifier/buckify_rocksdb.py
@@ -3,14 +3,11 @@ from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
 from targets_builder import TARGETSBuilder
-from optparse import OptionParser
 import os
 import fnmatch
 import sys
-import tempfile
 
 from util import ColorString
-import util
 
 # tests to export as libraries for inclusion in other projects
 _EXPORTED_TEST_LIBS = ["env_basic_test"]
@@ -36,7 +33,7 @@ def parse_src_mk(repo_path):
 # get all .cc / .c files
 def get_cc_files(repo_path):
     cc_files = []
-    for root, dirnames, filenames in os.walk(repo_path):
+    for root, dirnames, filenames in os.walk(repo_path):  # noqa: B007 T25377293 Grandfathered in
         root = root[(len(repo_path) + 1):]
         if "java" in root:
             # Skip java
@@ -84,7 +81,7 @@ def get_tests(repo_path):
             else:
                 # we consumed all the parallel tests
                 break
-
+    
     return tests
 
 
@@ -112,17 +109,19 @@ def generate_targets(repo_path):
         "rocksdb_test_lib",
         src_mk.get("MOCK_LIB_SOURCES", []) +
         src_mk.get("TEST_LIB_SOURCES", []) +
-        src_mk.get("EXP_LIB_SOURCES", []),
+        src_mk.get("EXP_LIB_SOURCES", []) +
+        src_mk.get("ANALYZER_LIB_SOURCES", []),
         [":rocksdb_lib"])
     # rocksdb_tools_lib
     TARGETS.add_library(
         "rocksdb_tools_lib",
         src_mk.get("BENCH_LIB_SOURCES", []) +
+        src_mk.get("ANALYZER_LIB_SOURCES", []) +
         ["util/testutil.cc"],
         [":rocksdb_lib"])
 
     # test for every test we found in the Makefile
-    for test in tests:
+    for test in sorted(tests):
         match_src = [src for src in cc_files if ("/%s.c" % test) in src]
         if len(match_src) == 0:
             print(ColorString.warning("Cannot find .cc file for %s" % test))