Skip to content
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

Restore ability to run single SLT file #14355

Merged
merged 1 commit into from
Jan 29, 2025
Merged

Restore ability to run single SLT file #14355

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
14 changes: 6 additions & 8 deletions datafusion/sqllogictest/bin/sqllogictests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ fn read_test_files<'a>(
let mut paths = read_dir_recursive(TEST_DIRECTORY)?
.into_iter()
.map(TestFile::new)
.filter(|f| options.check_test_file(&f.relative_path))
.filter(|f| options.check_test_file(&f.path))
.filter(|f| f.is_slt_file())
.filter(|f| f.check_tpch(options))
.filter(|f| f.check_sqlite(options))
Expand All @@ -507,7 +507,7 @@ fn read_test_files<'a>(
let mut sqlite_paths = read_dir_recursive(DATAFUSION_TESTING_TEST_DIRECTORY)?
.into_iter()
.map(TestFile::new)
.filter(|f| options.check_test_file(&f.relative_path))
.filter(|f| options.check_test_file(&f.path))
.filter(|f| f.is_slt_file())
.filter(|f| f.check_sqlite(options))
.filter(|f| options.check_pg_compat_file(f.path.as_path()))
Expand Down Expand Up @@ -544,10 +544,7 @@ struct Options {
#[clap(long, env = "INCLUDE_TPCH", help = "Include tpch files")]
include_tpch: bool,

#[clap(
action,
help = "regex like arguments passed to the program which are treated as cargo test filter (substring match on filenames)"
)]
#[clap(action, help = "test filter (substring match on filenames)")]
filters: Vec<String>,

#[clap(
Expand Down Expand Up @@ -594,15 +591,16 @@ impl Options {
/// To be compatible with this, treat the command line arguments as a
/// filter and that does a substring match on each input. returns
/// true f this path should be run
fn check_test_file(&self, relative_path: &Path) -> bool {
fn check_test_file(&self, path: &Path) -> bool {
if self.filters.is_empty() {
return true;
}

// otherwise check if any filter matches
let path_string = path.to_string_lossy();
self.filters
.iter()
.any(|filter| relative_path.to_string_lossy().contains(filter))
.any(|filter| path_string.contains(filter))
}

/// Postgres runner executes only tests in files with specific names or in
Expand Down