Index: lnt/tests/nt.py =================================================================== --- lnt/tests/nt.py +++ lnt/tests/nt.py @@ -330,12 +330,28 @@ make_variables['DISABLE_LTO'] = '1' if self.test_llcbeta: make_variables['ENABLE_LLCBETA'] = '1' - if self.test_small: + if self.test_mini: + if self.test_small or self.test_standard or self.test_large or self.test_extralarge: + fatal('the size options are mutually exclusive') + make_variables['MINI_PROBLEM_SIZE'] = '1' + elif self.test_small: + if self.test_mini or self.test_standard or self.test_large or self.test_extralarge: + fatal('the size options are mutually exclusive') make_variables['SMALL_PROBLEM_SIZE'] = '1' - if self.test_large: - if self.test_small: - fatal('the --small and --large options are mutually exclusive') + elif self.test_standard: + if self.test_mini or self.test_small or self.test_large or self.test_extralarge: + fatal('the size options are mutually exclusive') + make_variables['STANDARD_PROBLEM_SIZE'] = '1' + elif self.test_large: + if self.test_mini or self.test_small or self.test_standard or self.test_extralarge: + fatal('the size options are mutually exclusive') make_variables['LARGE_PROBLEM_SIZE'] = '1' + elif self.test_extralarge: + if self.test_mini or self.test_small or self.test_standard or self.test_large: + fatal('the size options are mutually exclusive') + make_variables['EXTRALARGE_PROBLEM_SIZE'] = '1' + else: + make_variables['STANDARD_PROBLEM_SIZE'] = '1' if self.test_benchmarking_only: make_variables['BENCHMARKING_ONLY'] = '1' if self.test_integrated_as: @@ -1637,12 +1653,21 @@ help="Disable use of link-time optimization", action="store_false", default=True) + group.add_option("", "--mini", dest="test_mini", + help="Use mini test inputs and disable other tests", + action="store_true", default=False) group.add_option("", "--small", dest="test_small", - help="Use smaller test inputs and disable large tests", + help="Use smaller test inputs and disable other tests", action="store_true", default=False) + group.add_option("", "--standard", dest="test_standard", + help="Use standard test inputs and disable other tests", + action="store_true", default=False) group.add_option("", "--large", dest="test_large", - help="Use larger test inputs", + help="Use large test inputs and disable other tests", action="store_true", default=False) + group.add_option("", "--extralarge", dest="test_extralarge", + help="Use extralarge test inputs and disable other tests", + action="store_true", default=False) group.add_option("", "--spec-with-ref", dest="test_spec_ref", help="Use reference test inputs for SPEC. " "This is currently experimental",