F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: (fixes #2949) Exit test.py if incorrect fullness option used

Browse Source
This commit is contained in:
Manuel Requena
2018-08-15 14:02:21 -07:00
parent 93e823d3e8
commit 40d380b2b1
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/model/test.cc
View File

@@ -955,7 +955,11 @@ TestRunnerImpl::Run (int argc, char *argv[])
fullness = arg + strlen("--fullness=");
// Set the maximum test length allowed.
if (fullness == "EXTENSIVE")
if (fullness == "QUICK")
{
maximumTestDuration = TestCase::QUICK;
}
else if (fullness == "EXTENSIVE")
{
maximumTestDuration = TestCase::EXTENSIVE;
}
@@ -965,7 +969,9 @@ TestRunnerImpl::Run (int argc, char *argv[])
}
else
{
maximumTestDuration = TestCase::QUICK;
// Wrong fullness option
PrintHelp (progname);
return 3;
}
}
else

4
test.py
View File

@@ -1887,8 +1887,8 @@ def main(argv):
parser.add_option("-u", "--update-data", action="store_true", dest="update_data", default=False,
help="If examples use reference data files, get them to re-generate them")
parser.add_option("-f", "--fullness", action="store", type="string", dest="fullness", default="QUICK",
metavar="FULLNESS",
parser.add_option("-f", "--fullness", action="store", type="choice", dest="fullness", default="QUICK",
metavar="FULLNESS", choices=["QUICK", "EXTENSIVE", "TAKES_FOREVER"],
help="choose the duration of tests to run: QUICK, EXTENSIVE, or TAKES_FOREVER, where EXTENSIVE includes QUICK and TAKES_FOREVER includes QUICK and EXTENSIVE (only QUICK tests are run by default)")
parser.add_option("-g", "--grind", action="store_true", dest="valgrind", default=False,