Changeset 807

Timestamp:

06/09/18 15:51:37 (7 years ago)

Author:

Maciej Komosinski

Message:

The -f/--file argument is now mandatory

File:

• tester/tester.py (modified) (6 diffs)

tester/tester.py

@@ -152 +152 @@
 
 
-def main(main_test_filename):
+def main():
         global input_text, name_template, test_name, exe_prog, exeargs
         name_template = ""
@@ -160 +160 @@
         parser.add_argument("-val", "--valgrind", help="Use valgrind", action="store_true")
         parser.add_argument("-c", "--nocolor", help="Don't use color output", action="store_true")
-        parser.add_argument("-f", "--file", help="File name with tests, default is '" + main_test_filename + "'")
+        parser.add_argument("-f", "--file", help="File name with tests", required=True)
         parser.add_argument("-tp", "--tests-path", help="tests directory, files containing test definitions, inputs and outputs are relative to this directory, default is '" + globals.THISDIR + "'")
         parser.add_argument("-fp", "--files-path", help="files directory, files tested by OUTFILECOMPARE are referenced relative to this directory, default is '" + globals.FILESDIR + "'")
@@ -168 +168 @@
         parser.add_argument("-ds", "--diffslashes", help="Discriminate between slashes (consider / and \\ different)", action="store_true")
         parser.add_argument("-err", "--always-show-stderr", help="Always print stderr (by default it is hidden if 0 errors in valgrind)", action="store_true")
-        parser.add_argument("-e", "--exe", help="Regexp 'search=replace' rule(s) transforming executable name(s) into paths (eg. '(.*)=path/to/\\1.exe')", action='append') #in the exaxmple, double backslash is just for printing
+        parser.add_argument("-e", "--exe", help="Regexp 'search=replace' rule(s) transforming executable name(s) into paths (eg. '(.*)=path/to/\\1.exe')", action='append')  # in the example, double backslash is just for printing
         parser.add_argument("-p", "--platform", help="Override platform identifier (referencing platform specific files " + globals.SPEC_INSERTPLATFORMDEPENDENTFILE + "), default:sys.platform (win32,linux2)")
         args = parser.parse_args()
@@ -178 +178 @@
                 main_test_filename = args.file
         if args.tests_path:
-                globals.THISDIR=args.tests_path
+                globals.THISDIR = args.tests_path
         if args.files_path:
-                globals.FILESDIR=args.files_path
+                globals.FILESDIR = args.files_path
         if args.working_path:
-                globals.EXEDIR=args.working_path
+                globals.EXEDIR = args.working_path
         if args.name:
                 name_template = args.name
@@ -196 +196 @@
         globals.init_colors(args)
 
-        fin = open(os.path.join(globals.THISDIR, main_test_filename))
+        fin = open(os.path.join(globals.THISDIR, args.file))
         reset_values()
-        exe_prog = "default" # no longer in reset_values (exe: persists across tests)
+        exe_prog = "default"  # no longer in reset_values (exe: persists across tests)
         outfile = []
         tests_failed = 0
@@ -255 +255 @@
 
 if __name__ == "__main__":
-        tests_failed, tests_total = main("testy.txt")
+        tests_failed, tests_total = main()
         print("%d / %d failed tests" % (tests_failed, tests_total))
         sys.exit(tests_failed)  # return the number of failed tests as exit code ("error level") to shell