From 847cdca151cd8eac564c079c9a2b4cc706a4ed9c Mon Sep 17 00:00:00 2001 From: Valentino Geron Date: Sun, 17 Jul 2022 08:47:35 +0300 Subject: [PATCH] Add an option to specify multiple skip files using `--skipfile` (#10975) `--skipfile` can be repeated. For example: ./runtests --skipfile file1.txt --skipfile file2.txt Co-authored-by: Valentino Geron --- tests/test_helper.tcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl index 5dabd8b1d..a38c2ebc1 100644 --- a/tests/test_helper.tcl +++ b/tests/test_helper.tcl @@ -600,7 +600,7 @@ proc print_help_screen {} { "--timeout Test timeout in seconds (default 20 min)." "--force-failure Force the execution of a test that always fails." "--config Extra config file argument." - "--skipfile Name of a file containing test names or regexp patterns (if starts with '/') that should be skipped (one per line)." + "--skipfile Name of a file containing test names or regexp patterns (if starts with '/') that should be skipped (one per line). This option can be repeated." "--skiptest Test name or regexp pattern (if starts with '/') to skip. This option can be repeated." "--tags Run only tests having specified tags or not having '-' prefixed tags." "--dont-clean Don't delete redis log files after the run." @@ -646,7 +646,7 @@ for {set j 0} {$j < [llength $argv]} {incr j} { set fp [open $arg r] set file_data [read $fp] close $fp - set ::skiptests [split $file_data "\n"] + set ::skiptests [concat $::skiptests [split $file_data "\n"]] } elseif {$opt eq {--skiptest}} { lappend ::skiptests $arg incr j