Commit 4deb53a5 authored by Bjorn Munch's avatar Bjorn Munch

Bug #49096 mtr: --mem option should be ignored on Windows

Ignored w/message in v1 and v2
parent ae3e5e3d
...@@ -905,6 +905,11 @@ sub command_line_setup () { ...@@ -905,6 +905,11 @@ sub command_line_setup () {
mtr_report("Using default engine '$used_default_engine'") mtr_report("Using default engine '$used_default_engine'")
if defined $used_default_engine; if defined $used_default_engine;
if ($glob_win32 and defined $opt_mem) {
mtr_report("--mem not supported on Windows, ignored");
$opt_mem= undef;
}
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Check if we should speed up tests by trying to run on tmpfs # Check if we should speed up tests by trying to run on tmpfs
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
......
...@@ -1080,6 +1080,11 @@ sub command_line_setup { ...@@ -1080,6 +1080,11 @@ sub command_line_setup {
} }
} }
if (IS_WINDOWS and defined $opt_mem) {
mtr_report("--mem not supported on Windows, ignored");
$opt_mem= undef;
}
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Check if we should speed up tests by trying to run on tmpfs # Check if we should speed up tests by trying to run on tmpfs
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment