Skip to content

Commit 15fd0b7

Browse files
committed
this should wok
1 parent ba5d53c commit 15fd0b7

6 files changed

Lines changed: 77 additions & 19 deletions

File tree

.github/workflows/mainline-format.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,7 @@ jobs:
2121
run: chown -R ci:ci "$GITHUB_WORKSPACE"
2222

2323
- name: Run formatters
24-
run: sudo -u ci bazelisk run :format && git diff --quiet
24+
run: sudo -u ci bazelisk run :format
25+
26+
- name: Check diff
27+
run: sudo -u ci git diff --quiet

.github/workflows/mainline-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
inputs:
66
artifact_name:
77
type: string
8-
default: hcpu-tarballs*
8+
default: "hcpu-tarballs*"
99

1010
jobs:
1111
install-and-test:

tests/Integration/BUILD.bazel

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
1-
load("@rules_cc//cc:defs.bzl", "cc_test")
1+
load("@rules_cc//cc:defs.bzl", "cc_test", "cc_library", "cc_binary")
22

3-
cc_test(
4-
name = "integration-test",
3+
cc_library(
4+
name = "integration_tests_lib",
55
srcs = glob(["**/*.cpp"]),
6-
linkstatic = True,
6+
alwayslink = True,
77
deps = [
88
"//src/Assembler:assembler_core",
99
"//src/Emulator:emulator_core",
1010
"//src/PCH:pch_cstd",
1111
"//tests:pch_gtest",
1212
"//tests:test_fixtures",
13-
"@fmt",
13+
],
14+
)
15+
16+
cc_test(
17+
name = "integration-test",
18+
deps = [
19+
":integration_tests_lib",
20+
"@googletest//:gtest_main",
21+
],
22+
)
23+
24+
cc_binary(
25+
name = "packaged-integration-test",
26+
visibility = ["//tools/packaging:__pkg__"],
27+
deps = [
28+
":integration_tests_lib",
1429
"@googletest//:gtest_main",
1530
],
1631
)

tests/Modular/BUILD.bazel

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,31 @@
1-
load("@rules_cc//cc:defs.bzl", "cc_test")
1+
load("@rules_cc//cc:defs.bzl", "cc_test", "cc_library", "cc_binary")
22

3-
cc_test(
4-
name = "modular-test",
5-
srcs = glob(
6-
["**/*.cpp"],
7-
),
8-
linkstatic = True,
3+
cc_library(
4+
name = "modular_tests_lib",
5+
srcs = glob(["**/*.cpp"]),
6+
alwayslink = True,
97
deps = [
108
"//src/Assembler:assembler_core",
119
"//src/Emulator:emulator_core",
1210
"//src/PCH:pch_cstd",
1311
"//tests:pch_gtest",
1412
"//tests:test_fixtures",
15-
"@fmt",
13+
],
14+
)
15+
16+
cc_test(
17+
name = "modular-test",
18+
deps = [
19+
":modular_tests_lib",
20+
"@googletest//:gtest_main",
21+
],
22+
)
23+
24+
cc_binary(
25+
name = "packaged-modular-test",
26+
visibility = ["//tools/packaging:__pkg__"],
27+
deps = [
28+
":modular_tests_lib",
1629
"@googletest//:gtest_main",
1730
],
1831
)

tests/Pog/BUILD.bazel

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,29 @@
1-
load("@rules_cc//cc:defs.bzl", "cc_test")
1+
load("@rules_cc//cc:defs.bzl", "cc_test", "cc_library", "cc_binary")
22

3-
cc_test(
4-
name = "test-pog",
3+
cc_library(
4+
name = "pog_tests_lib",
55
srcs = glob(["**/*.cpp"]),
6+
alwayslink = True,
67
deps = [
78
"//src/PCH:pch_cstd",
89
"//src/Pog:pog",
910
"//tests:pch_gtest",
11+
],
12+
)
13+
14+
cc_test(
15+
name = "test-pog",
16+
deps = [
17+
":pog_tests_lib",
18+
"@googletest//:gtest_main",
19+
],
20+
)
21+
22+
cc_binary(
23+
name = "packaged-test-pog",
24+
visibility = ["//tools/packaging:__pkg__"],
25+
deps = [
26+
":pog_tests_lib",
1027
"@googletest//:gtest_main",
1128
],
1229
)

tools/packaging/BUILD.bazel

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ pkg_files(
1616
prefix = "usr/bin",
1717
)
1818

19+
pkg_files(
20+
name = "dist_tests",
21+
srcs = [
22+
"//tests/Pog:packaged-test-pog",
23+
"//tests/Modular:packaged-modular-test",
24+
"//tests/Integration:packaged-integration-test",
25+
],
26+
prefix = "opt/hcpu/tests",
27+
)
28+
1929
pkg_vars(
2030
name = "dist_vars",
2131
platform = select({
@@ -28,7 +38,7 @@ pkg_vars(
2838

2939
pkg_tar(
3040
name = "hcpu",
31-
srcs = [":dist_files"],
41+
srcs = [":dist_files", ":dist_tests"],
3242
extension = "tar.gz",
3343
include_runfiles = True,
3444
package_file_name = "{product_name}-{version}-{compiler}.tar.gz",

0 commit comments

Comments
 (0)