andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the TARGETS file Starlark compliant (#7743)

Browse Source 
Summary:
Buck TARGETS files are sometimes parsed with Python, and sometimes with Starlark - this TARGETS file was not Starlark compliant. In Starlark you can't have a top-level if in a TARGETS file, but you can have a ternary `a if b else c`. Therefore I converted TARGETS, and updated the generator for it.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/7743

Reviewed By: pdillinger

Differential Revision: D25342587

Pulled By: ndmitchell

fbshipit-source-id: 88cbe8632071a45a3ea8675812967614c62c78d1
This commit is contained in:
Neil Mitchell 2020-12-07 10:26:20 -08:00 committed by Facebook GitHub Bot
parent 1df8584896
commit b77569f18b
2 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
TARGETS
View File

@ -775,26 +775,24 @@ cpp_library(
external_deps = ROCKSDB_EXTERNAL_DEPS, external_deps = ROCKSDB_EXTERNAL_DEPS,
) )
if not is_opt_mode: cpp_binary(
cpp_binary( name = "c_test_bin",
name = "c_test_bin", srcs = ["db/c_test.c"],
srcs = ["db/c_test.c"], arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS, os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS, compiler_flags = ROCKSDB_COMPILER_FLAGS,
compiler_flags = ROCKSDB_COMPILER_FLAGS, preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS, deps = [":rocksdb_test_lib"],
deps = [":rocksdb_test_lib"], ) if not is_opt_mode else None
)
if not is_opt_mode: custom_unittest(
custom_unittest( "c_test",
"c_test", command = [
command = [ native.package_name() + "/buckifier/rocks_test_runner.sh",
native.package_name() + "/buckifier/rocks_test_runner.sh", "$(location :{})".format("c_test_bin"),
"$(location :{})".format("c_test_bin"), ],
], type = "simple",
type = "simple", ) if not is_opt_mode else None
)
cpp_library( cpp_library(
name = "env_basic_test_lib", name = "env_basic_test_lib",

36
buckifier/targets_builder.py
View File

@ -79,26 +79,24 @@ class TARGETSBuilder(object):
def add_c_test(self): def add_c_test(self):
self.targets_file.write(b""" self.targets_file.write(b"""
if not is_opt_mode: cpp_binary(
cpp_binary( name = "c_test_bin",
name = "c_test_bin", srcs = ["db/c_test.c"],
srcs = ["db/c_test.c"], arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS, os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS, compiler_flags = ROCKSDB_COMPILER_FLAGS,
compiler_flags = ROCKSDB_COMPILER_FLAGS, preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS, deps = [":rocksdb_test_lib"],
deps = [":rocksdb_test_lib"], ) if not is_opt_mode else None
)
if not is_opt_mode: custom_unittest(
custom_unittest( "c_test",
"c_test", command = [
command = [ native.package_name() + "/buckifier/rocks_test_runner.sh",
native.package_name() + "/buckifier/rocks_test_runner.sh", "$(location :{})".format("c_test_bin"),
"$(location :{})".format("c_test_bin"), ],
], type = "simple",
type = "simple", ) if not is_opt_mode else None
)
""") """)
def register_test(self, def register_test(self,