Skip to content

Make soft error act the same in OSS #1288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bvinc wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −15
Open

Make soft error act the same in OSS #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/buck2_core/tests/soft_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ use std::sync::Once;
use buck2_core::error::StructuredErrorOptions;
use buck2_core::error::initialize;
use buck2_core::error::reset_soft_error_counters;
use buck2_core::is_open_source;
use buck2_core::soft_error;
use buck2_error::buck2_error;

Expand Down Expand Up @@ -51,9 +50,6 @@ fn test_init() -> MutexGuard<'static, ()> {

#[test]
fn test_soft_error() {
if is_open_source() {
return; // Errors are always hard in open source
}
let _guard = test_init();

let before_error_line = line!();
Expand All @@ -73,9 +69,6 @@ fn test_soft_error() {

#[test]
fn test_reset_counters() {
if is_open_source() {
return; // Errors are always hard in open source
}
let _guard = test_init();

assert_eq!(0, RESULT.lock().unwrap().len(), "Sanity check");
Expand Down
8 changes: 0 additions & 8 deletions app/buck2_env/src/soft_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,14 +291,6 @@ pub fn handle_soft_error(
return Err(err.context("Upgraded warning to failure via $BUCK2_HARD_ERROR"));
}

// @oss-disable: let is_open_source = false;
let is_open_source = true; // @oss-enable
if is_open_source {
// We don't log these, and we have no legacy users, and they might not upgrade that often,
// so lets just break open source things immediately.
return Err(err);
}

Ok(err)
}

Expand Down
Loading