[FEATURE] Added benchmark results. Fixed #95 and Fixed #78

Author: Seluj78

42PyChecker.py

@@ -52,8 +52,8 @@ def main():
     # @todo: Check what option is given based on the selected project.
     parser.add_argument("--no-required", help="Disables required functions check", action="store_true")
     parser.add_argument("--no-libft-unit-test", help="Disables libft-unit-test", action="store_true")
-    # @todo: Fix --do-benchmark option for libft-unit-test
-    parser.add_argument("--do-benchmark", help="Disables libft-unit-test benchmarking", action="store_false")
+    parser.add_argument("--do-benchmark", help="Disables libft-unit-test benchmarking", action="store_true")
+
 
     # Calls the parser for the arguments we asked to implement.
     args = parser.parse_args()

PyChecker/projects/libft.py

@@ -65,7 +65,6 @@ def check(root_path: str, args):
     bonus_functions = ['ft_lstnew.c', 'ft_lstdelone.c', 'ft_lstdel.c',
                        'ft_lstiter.c', 'ft_lstadd.c', 'ft_lstmap.c']
     authorized_functions = ['free', 'malloc', 'write', 'main']
-    # @todo: add libft-unit-test to the testing suite
     if not args.no_author:
         author_results = author.check(args.path)
     if not args.no_required:
@@ -88,7 +87,10 @@ def check(root_path: str, args):
     if not args.no_maintest:
         maintest_ok, maintest_fail = maintest.run_libft(args.path, root_path)
     if not args.no_libft_unit_test:
-        libft_unit_test_results = libft_unit_test.run(root_path, args)
+        if args.do_benchmark:
+            libft_unit_test_results, benchmark_results = libft_unit_test.run(root_path, args)
+        else:
+            libft_unit_test_results = libft_unit_test.run(root_path, args)
     print("\n\n\nThe results are in:\n")
     if not args.no_author:
         print("Author File: \n" + author_results + '\n')
@@ -115,5 +117,9 @@ def check(root_path: str, args):
     if not args.no_maintest:
         print("Maintest: \n{} OKs and {} FAILs.".format(maintest_ok, maintest_fail))
     if not args.no_libft_unit_test:
-        print('libft-unit-test: \n' + libft_unit_test_results)
+        if args.do_benchmark:
+            # @todo: Strip useless chars from benchmark results
+            print('libft-unit-test: \n' + libft_unit_test_results + '\n\n' + benchmark_results)
+        else:
+            print('libft-unit-test: \n' + libft_unit_test_results)
     return 0

PyChecker/testing_suite/libft_unit_test.py

@@ -19,18 +19,24 @@ def run(root_path: str, args):
             file.write("Sorry, this testing suite can only be ran on Darwin computers (MacOS)\n")
         return "Sorry, this testing suite can only be ran on Darwin computers (MacOS)"
     with open(root_path + '/.mylibftunittest', 'w+') as file:
-        result = subprocess.run(['make', '-C', root_path + '/testing_suites/libft-unit-test', 'LIBFTDIR=' + args.path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode('utf-8')
+        result = subprocess.run(['make', 're', '-C', root_path + '/testing_suites/libft-unit-test', 'LIBFTDIR=' + args.path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode('utf-8')
         file.write(result)
         print(result)
         result = subprocess.run(['make', 'f', '-C', root_path + '/testing_suites/libft-unit-test', 'LIBFTDIR=' + args.path], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode('utf-8')
         print(result)
         file.write(result)
         os.rename(root_path + '/testing_suites/libft-unit-test/result.log', root_path + '/.mylibftunittest-results')
         if args.do_benchmark:
-            result = subprocess.run([root_path + '/testing_suites/libft-unit-test/run_test', '-b'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode('utf-8')
+            oldpwd = os.getcwd()
+            os.chdir(root_path + '/testing_suites/libft-unit-test/')
+            result = subprocess.run(['./run_test', '-b'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode('utf-8')
+            os.chdir(oldpwd)
             print(result)
             file.write(result)
-    # @todo: return results from benchmark
+            with open(root_path + '/.mylibftunittest', 'r') as file2:
+                for line in file2:
+                    if "WINNER:" in line:
+                        benchmark_results = line
     with io.open(root_path + '/.mylibftunittest-results', "r", encoding="ISO-8859-1") as file:
         data = file.read()
         results = 'OKs: ' + str(data.count('OK')) + '\n'
@@ -40,4 +46,7 @@ def run(root_path: str, args):
         results += 'protected: ' + str(data.count('protected')) + '\n'
         results += 'not protected:' + str(data.count('not protected'))
     print(results)
-    return results
+    if args.do_benchmark:
+        return results, benchmark_results
+    else:
+        return results