Skip to content

Commit ce370aa

Browse files
bjacotgcopybara-github
authored andcommitted
Merge all the BUILD target in googletest into one target.
This will align the dependency management in and out of google3. PiperOrigin-RevId: 529219068
1 parent 9f3e413 commit ce370aa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+7
-352
lines changed

googletest/integration_tests/assertion_failure_in_subroutine.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ fn main() {}
1616

1717
#[cfg(test)]
1818
mod tests {
19-
#[cfg(not(google3))]
2019
use googletest::matchers;
2120
use googletest::{google_test, verify_that, Result};
2221
use matchers::eq;

googletest/integration_tests/async_test_with_expect_that.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ fn main() {}
1717
#[deny(warnings)]
1818
#[cfg(test)]
1919
mod tests {
20-
#[cfg(not(google3))]
2120
use googletest::matchers;
2221
use googletest::{expect_that, verify_that, Result};
2322
use matchers::eq;

googletest/integration_tests/custom_error_message.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ fn main() {}
1616

1717
#[cfg(test)]
1818
mod tests {
19-
#[cfg(not(google3))]
2019
use googletest::matchers;
2120
use googletest::{verify_that, GoogleTestSupport, Result};
2221
use matchers::eq;

googletest/integration_tests/expect_that_failure.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ fn main() {}
1616

1717
#[cfg(test)]
1818
mod tests {
19-
#[cfg(not(google3))]
2019
use googletest::matchers;
2120
use googletest::{expect_that, google_test, Result};
2221
use matchers::eq;

googletest/integration_tests/first_failure_aborts.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ fn main() {}
1616

1717
#[cfg(test)]
1818
mod tests {
19-
#[cfg(not(google3))]
2019
use googletest::matchers;
2120
use googletest::{google_test, verify_that, GoogleTestSupport, Result};
2221
use matchers::eq;

googletest/integration_tests/google_test_with_rstest.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414

1515
fn main() {}
1616

17-
// Mixing rstest and googletest::test should not result in any compiler warnings. The
18-
// fact that this successfully compiles is part of the test.
17+
// Mixing rstest and googletest::test should not result in any compiler
18+
// warnings. The fact that this successfully compiles is part of the test.
1919
#[deny(warnings)]
2020
#[cfg(test)]
2121
mod tests {
22-
#[cfg(not(google3))]
2322
use googletest::matchers;
2423
use googletest::{verify_that, Result};
2524
use matchers::eq;

googletest/integration_tests/integration_tests.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@ fn main() {}
1616

1717
#[cfg(test)]
1818
mod tests {
19-
#[cfg(not(google3))]
2019
use googletest::{all, matchers, matchers::str_matcher};
2120
use googletest::{
2221
assert_that, expect_pred, expect_that, test, verify_pred, verify_that, GoogleTestSupport,
2322
Result,
2423
};
2524
use indoc::indoc;
26-
#[cfg(google3)]
27-
use matchers::all;
2825
use matchers::{anything, contains_regex, contains_substring, displays_as, eq, err, not};
2926
use std::process::Command;
3027
use str_matcher::StrMatcherConfigurator;

googletest/integration_tests/non_fatal_failure_in_subroutine.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ fn main() {}
1616

1717
#[cfg(test)]
1818
mod tests {
19-
#[cfg(not(google3))]
2019
use googletest::matchers;
2120
use googletest::{google_test, verify_that, GoogleTestSupport, Result};
2221
use matchers::eq;

googletest/integration_tests/simple_assertion_failure.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ fn main() {}
1616

1717
#[cfg(test)]
1818
mod tests {
19-
#[cfg(not(google3))]
2019
use googletest::matchers;
2120
use googletest::{verify_that, Result};
2221
use matchers::eq;

googletest/integration_tests/simple_assertion_failure_with_assert_that.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ fn main() {}
1717
#[cfg(test)]
1818
mod tests {
1919
use googletest::assert_that;
20-
#[cfg(not(google3))]
2120
use googletest::matchers;
2221
use matchers::eq;
2322

0 commit comments

Comments
 (0)