-
Notifications
You must be signed in to change notification settings - Fork 15
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.
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
Replace if cfg!(kani)
by #[cfg(kani)]
#148
Merged
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev
Previous commit
Put Kani specific implementation in separate functions
- Loading branch information
commit 7bfbf1b3d3eae6be9c39218ba0c0aab8536fb08b
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,18 +27,21 @@ pub struct TargetLocation { | |
} | ||
|
||
impl TargetLocation { | ||
#[cfg(kani)] | ||
pub fn should_run(&self) -> bool { | ||
#[cfg(not(kani))] | ||
{ | ||
// cargo-bolero needs to resolve information about the target | ||
if let Ok(mode) = ::std::env::var("CARGO_BOLERO_SELECT") { | ||
match mode.as_str() { | ||
"all" => self.print(), | ||
"one" if self.is_exact_match() => self.print(), | ||
_ => {} | ||
} | ||
return false; | ||
true | ||
} | ||
|
||
#[cfg(not(kani))] | ||
pub fn should_run(&self) -> bool { | ||
// cargo-bolero needs to resolve information about the target | ||
if let Ok(mode) = ::std::env::var("CARGO_BOLERO_SELECT") { | ||
match mode.as_str() { | ||
"all" => self.print(), | ||
"one" if self.is_exact_match() => self.print(), | ||
_ => {} | ||
} | ||
return false; | ||
} | ||
true | ||
} | ||
|
@@ -62,72 +65,66 @@ impl TargetLocation { | |
); | ||
} | ||
|
||
#[cfg(kani)] | ||
pub fn abs_path(&self) -> Option<PathBuf> { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here. |
||
#[cfg(kani)] | ||
{ | ||
None | ||
} | ||
None | ||
} | ||
|
||
#[cfg(not(kani))] | ||
{ | ||
let file = Path::new(self.file); | ||
#[cfg(not(kani))] | ||
pub fn abs_path(&self) -> Option<PathBuf> { | ||
let file = Path::new(self.file); | ||
|
||
#[cfg(not(miri))] // miri does not currently support this call | ||
{ | ||
if let Ok(file) = file.canonicalize() { | ||
return Some(file); | ||
} | ||
#[cfg(not(miri))] // miri does not currently support this call | ||
{ | ||
if let Ok(file) = file.canonicalize() { | ||
return Some(file); | ||
} | ||
|
||
Path::new(self.manifest_dir) | ||
.ancestors() | ||
.find_map(|ancestor| { | ||
let path = ancestor.join(file); | ||
if path.exists() { | ||
Some(path) | ||
} else { | ||
None | ||
} | ||
}) | ||
} | ||
|
||
Path::new(self.manifest_dir) | ||
.ancestors() | ||
.find_map(|ancestor| { | ||
let path = ancestor.join(file); | ||
if path.exists() { | ||
Some(path) | ||
} else { | ||
None | ||
} | ||
}) | ||
} | ||
|
||
#[cfg(kani)] | ||
pub fn work_dir(&self) -> Option<PathBuf> { | ||
#[cfg(kani)] | ||
{ | ||
None | ||
} | ||
|
||
#[cfg(not(kani))] | ||
{ | ||
let mut work_dir = self.abs_path()?; | ||
work_dir.pop(); | ||
None | ||
} | ||
|
||
if !self.is_harnessed() { | ||
return Some(work_dir); | ||
} | ||
#[cfg(not(kani))] | ||
pub fn work_dir(&self) -> Option<PathBuf> { | ||
let mut work_dir = self.abs_path()?; | ||
work_dir.pop(); | ||
|
||
work_dir.push("__fuzz__"); | ||
if let Some(test_name) = self.test_name.as_ref() { | ||
work_dir.push(test_name); | ||
} else { | ||
work_dir.push(self.fuzz_dir()); | ||
} | ||
if !self.is_harnessed() { | ||
return Some(work_dir); | ||
} | ||
|
||
Some(work_dir) | ||
work_dir.push("__fuzz__"); | ||
if let Some(test_name) = self.test_name.as_ref() { | ||
work_dir.push(test_name); | ||
} else { | ||
work_dir.push(self.fuzz_dir()); | ||
} | ||
|
||
Some(work_dir) | ||
} | ||
|
||
#[cfg(kani)] | ||
pub fn is_harnessed(&self) -> bool { | ||
#[cfg(kani)] | ||
{ | ||
false | ||
} | ||
false | ||
} | ||
|
||
#[cfg(not(kani))] | ||
{ | ||
is_harnessed(self.item_path) | ||
} | ||
#[cfg(not(kani))] | ||
pub fn is_harnessed(&self) -> bool { | ||
is_harnessed(self.item_path) | ||
} | ||
|
||
fn fuzz_dir(&self) -> String { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be cleaner to duplicate this function instead since there is no common code between kani and not(kani)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure