Skip to content

Commit f46bc07

Browse files
authored
fix: added tests with proper deps (#7)
1 parent bd4dfde commit f46bc07

File tree

10 files changed

+57
-34
lines changed

10 files changed

+57
-34
lines changed

.bazelignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test

.bazelrc

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
startup --windows_enable_symlinks
2-
common --enable_bzlmod
3-
build --enable_platform_specific_config
4-
build --incompatible_use_platforms_repo_for_constraints
5-
build --incompatible_enable_cc_toolchain_resolution
6-
build --incompatible_strict_action_env
7-
build --enable_runfiles
8-
build --noincompatible_remove_rule_name_parameter
9-
query --noincompatible_remove_rule_name_parameter
10-
11-
# Temporary until https://github.com/grailbio/bazel-toolchain/pull/198 is merged
12-
build:linux --extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-linux
13-
14-
common:ci --announce_rc
15-
common:ci --verbose_failures
16-
common:ci --keep_going
17-
common:ci --disk_cache=~/.cache/bazel-disk-cache
1+
import %workspace%/bazel/common.bazelrc
182

193
try-import %workspace%/user.bazelrc

.gitignore

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
# bazel
2-
/bazel-*
3-
/user.bazelrc
4-
5-
# https://github.com/hedronvision/bazel-compile-commands-extractor
6-
/compile_commands.json
7-
/external
8-
9-
# clangd
10-
/.cache/
11-
12-
# Visual Studio files
13-
/.vs
2+
bazel-*
3+
user.bazelrc
4+
compile_commands.json
5+
external/
6+
.cache/

WORKSPACE.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
workspace(name = "ecsact_codegen")
2-
31
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
42

53
http_archive(

codegen_plugin.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ def cc_ecsact_codegen_plugin(name = None, srcs = [], deps = [], defines = [], no
132132
name = "{}__validate".format(name),
133133
srcs = ["@ecsact_runtime//:ecsact/codegen/ecsact_codegen_plugin_test.cc"],
134134
args = ["$(rootpath :{}_bin)".format(name)],
135-
copts = _copts,
136135
data = [":{}_bin".format(name)],
137136
deps = [
138137
"@bazel_tools//tools/cpp/runfiles",
139138
"@ecsact_runtime//:codegen_plugin_validate",
140139
],
140+
**kwargs
141141
)

test/.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import %workspace%/../bazel/common.bazelrc
2+
3+
try-import %workspace%/user.bazelrc
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@rules_cc//cc:defs.bzl", "cc_binary")
22
load("@bazel_skylib//rules:build_test.bzl", "build_test")
3-
load("//bazel:copts.bzl", "copts")
4-
load("//:codegen_plugin.bzl", "ecsact_codegen_plugin")
3+
load("@ecsact_codegen//bazel:copts.bzl", "copts")
4+
load("@ecsact_codegen//:codegen_plugin.bzl", "ecsact_codegen_plugin")
55

66
cc_binary(
77
name = "mock_plugin_bin",

test/MODULE.bazel

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
module(name = "ecsact_codegen_test")
2+
3+
bazel_dep(name = "rules_cc", version = "0.0.8")
4+
bazel_dep(name = "bazel_skylib", version = "1.4.2")
5+
bazel_dep(name = "ecsact_codegen")
6+
7+
local_path_override(
8+
module_name = "ecsact_codegen",
9+
path = "..",
10+
)

test/WORKSPACE.bazel

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2+
3+
http_archive(
4+
name = "hedron_compile_commands",
5+
sha256 = "ed5aea1dc87856aa2029cb6940a51511557c5cac3dbbcb05a4abd989862c36b4",
6+
strip_prefix = "bazel-compile-commands-extractor-e16062717d9b098c3c2ac95717d2b3e661c50608",
7+
url = "https://github.com/hedronvision/bazel-compile-commands-extractor/archive/e16062717d9b098c3c2ac95717d2b3e661c50608.tar.gz",
8+
)
9+
10+
load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")
11+
12+
hedron_compile_commands_setup()
13+
14+
http_archive(
15+
name = "com_grail_bazel_toolchain",
16+
sha256 = "5fb0a6ae0f5bc72a7d80e6de0edad906c9936729734009f1c01dac4b06f966e0",
17+
strip_prefix = "bazel-toolchain-f94335f1f5434256b1793dafbb7dd07773b0e76e",
18+
url = "https://github.com/grailbio/bazel-toolchain/archive/f94335f1f5434256b1793dafbb7dd07773b0e76e.zip",
19+
)
20+
21+
load("@com_grail_bazel_toolchain//toolchain:deps.bzl", "bazel_toolchain_dependencies")
22+
23+
bazel_toolchain_dependencies()
24+
25+
load("@com_grail_bazel_toolchain//toolchain:rules.bzl", "llvm_toolchain")
26+
27+
llvm_toolchain(
28+
name = "llvm_toolchain",
29+
llvm_version = "16.0.4",
30+
)
31+
32+
load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains")
33+
34+
llvm_register_toolchains()

0 commit comments

Comments
 (0)