From 3d7e1260e014d06c79fb4cb2becdf4626a673dc9 Mon Sep 17 00:00:00 2001 From: Daniel Brauner Date: Tue, 22 Oct 2024 14:05:13 +0200 Subject: [PATCH] added external dependency to simple test --- .../google/idea/blaze/clwb/SimpleTest.java | 8 ++++++++ clwb/tests/projects/simple/WORKSPACE | 20 +++++++++++++++++++ clwb/tests/projects/simple/main/BUILD | 9 +++++++-- clwb/tests/projects/simple/main/test.cc | 5 +++++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 clwb/tests/projects/simple/main/test.cc diff --git a/clwb/tests/integrationtests/com/google/idea/blaze/clwb/SimpleTest.java b/clwb/tests/integrationtests/com/google/idea/blaze/clwb/SimpleTest.java index 81f14a17246..32297ef94ed 100644 --- a/clwb/tests/integrationtests/com/google/idea/blaze/clwb/SimpleTest.java +++ b/clwb/tests/integrationtests/com/google/idea/blaze/clwb/SimpleTest.java @@ -21,6 +21,7 @@ public void testClwb() { errors.assertNoErrors(); checkCompiler(); + checkTest(); } private void checkCompiler() { @@ -36,4 +37,11 @@ private void checkCompiler() { assertContainsHeader("iostream", compilerSettings); } + + private void checkTest() { + final var compilerSettings = findFileCompilerSettings("main/test.cc"); + + assertContainsHeader("iostream", compilerSettings); + assertContainsHeader("catch2/catch_test_macros.hpp", compilerSettings); + } } diff --git a/clwb/tests/projects/simple/WORKSPACE b/clwb/tests/projects/simple/WORKSPACE index e69de29bb2d..d816d56188f 100644 --- a/clwb/tests/projects/simple/WORKSPACE +++ b/clwb/tests/projects/simple/WORKSPACE @@ -0,0 +1,20 @@ +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( + name = "bazel_skylib", + sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", + ], +) + +load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") +bazel_skylib_workspace() + +http_archive( + name = "catch2", + sha256 = "c991b247a1a0d7bb9c39aa35faf0fe9e19764213f28ffba3109388e62ee0269c", + strip_prefix = "Catch2-3.7.1", + urls = ["https://github.com/catchorg/Catch2/archive/v3.7.1.tar.gz"], +) diff --git a/clwb/tests/projects/simple/main/BUILD b/clwb/tests/projects/simple/main/BUILD index fc17320ee1b..01154f11177 100644 --- a/clwb/tests/projects/simple/main/BUILD +++ b/clwb/tests/projects/simple/main/BUILD @@ -1,7 +1,12 @@ -load("@rules_cc//cc:defs.bzl", "cc_binary") +load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test") cc_binary( name = "hello-world", srcs = ["hello-world.cc"], - visibility = ["//visibility:public"] +) + +cc_test( + name = "test", + srcs = ["test.cc"], + deps = ["@catch2//:catch2_main"], ) diff --git a/clwb/tests/projects/simple/main/test.cc b/clwb/tests/projects/simple/main/test.cc new file mode 100644 index 00000000000..c6fd211d423 --- /dev/null +++ b/clwb/tests/projects/simple/main/test.cc @@ -0,0 +1,5 @@ +#include + +TEST_CASE("0") { + REQUIRE(0 == 0); +} \ No newline at end of file