Changes in src/tests/test.py [4782b39:850fda6]

File:

• src/tests/test.py (modified) (9 diffs)

src/tests/test.py

@@ -104 +104 @@
 #               running test functions
 ################################################################################
-def run_single_test(test, generate, dry_run, debug):
+def run_single_test(test, generate, dry_run):
 
         # find the output file based on the test name and options flag
@@ -113 +113 @@
         sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
 
-        options = "-debug" if debug else "-nodebug";
-
         # build, skipping to next test on error
-        make_ret, _ = sh("""%s EXTRA_FLAGS="-quiet %s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
+        make_ret, _ = sh("%s %s 2> %s 1> /dev/null" % (make_cmd, test.name, out_file), dry_run)
 
         # if the make command succeds continue otherwise skip to diff
@@ -167 +165 @@
         return retcode, error
 
-def run_test_instance(t, generate, dry_run, debug) :
+def run_test_instance(t, generate, dry_run) :
         # print formated name
         name_txt = "%20s  " % t.name
 
         #run the test instance and collect the result
-        test_failed, error = run_single_test(t, generate, dry_run, debug)
+        test_failed, error = run_single_test(t, generate, dry_run)
 
         # update output based on current action
@@ -196 +194 @@
 
 # run the given list of tests with the given parameters
-def run_tests(tests, generate, dry_run, jobs, debug) :
+def run_tests(tests, generate, dry_run, jobs) :
         # clean the sandbox from previous commands
         sh("%s clean > /dev/null 2>&1" % make_cmd, dry_run)
@@ -209 +207 @@
         pool = Pool(jobs)
         try :
-                results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run, debug=debug), tests ).get(99999999)
+                results = pool.map_async(partial(run_test_instance, generate=generate, dry_run=dry_run), tests ).get(99999999)
         except KeyboardInterrupt:
                 pool.terminate()
@@ -224 +222 @@
         return 0
 
-def yes_no(string):
-        if string == "yes" :
-                return True
-        if string == "no" :
-                return False
-        raise argparse.ArgumentTypeError(msg)
-        return False
-
-
 ################################################################################
 #               main loop
@@ -238 +227 @@
 # create a parser with the arguments for the tests script
 parser = argparse.ArgumentParser(description='Script which runs cforall tests')
-parser.add_argument('--debug', help='Run all tests in debug or release', type=yes_no, default='no')
 parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
 parser.add_argument('--list', help='List all test available', action='store_true')
@@ -308 +296 @@
         sys.exit(1)
 
-print('Running (%s) on %i cores' % ("debug" if options.debug else "no debug", options.jobs))
+print('Running on %i cores' % options.jobs)
 make_cmd = "make" if make_flags else ("make -j%i" % options.jobs)
 
@@ -317 +305 @@
 else :
         # otherwise run all tests and make sure to return the correct error code
-        sys.exit( run_tests(tests, options.regenerate_expected, options.dry_run, options.jobs, options.debug) )
+        sys.exit( run_tests(tests, options.regenerate_expected, options.dry_run, options.jobs) )