commit 87e80e558d86d9d5820d9e9ab12c9369311b82b8
author onqtam <vik.kirilov@gmail.com> Thu Sep 07 12:50:53 2017 +0300
committer onqtam <vik.kirilov@gmail.com> Mon Sep 11 14:36:12 2017 +0300
tree 184feca728039af12e997b761196f537db3b1bd0
parent d44e939498237ff6b78ee6783adfd45b4edfa59e

added disabled benchmarking for catch as well (using CATCH_CONFIG_DISABLE)

scripts/bench/bench.py

diff --git a/scripts/bench/bench.py b/scripts/bench/bench.py
index 3293ec1..047d38c 100755
--- a/scripts/bench/bench.py
+++ b/scripts/bench/bench.py
@@ -17,7 +17,7 @@
     parser.add_argument("compiler",     choices=['msvc', 'gcc', 'clang'], default='msvc', help = "compiler to use")
     parser.add_argument("--debug",      action = "store_true",  help = "build in debug")
     parser.add_argument("--catch",      action = "store_true",  help = "use Catch instead of doctest")
-    parser.add_argument("--disabled",   action = "store_true",  help = "<doctest> define DOCTEST_CONFIG_DISABLE")
+    parser.add_argument("--disabled",   action = "store_true",  help = "DOCTEST_CONFIG_DISABLE / CATCH_CONFIG_DISABLE")
     parser.add_argument("--fast",       action = "store_true",  help = "define the doctest/Catch fast config identifier")
     parser.add_argument("--files",      type=int, default=1,    help = "number of source files (besides the implementation)")
     parser.add_argument("--tests",      type=int, default=1,    help = "number of test cases per source file")
@@ -81,7 +81,9 @@
 
 # setup defines used
 defines = ""
-if args.disabled:
+if args.catch and args.disabled:
+    defines += "#define CATCH_CONFIG_DISABLE\n"
+if not args.catch and args.disabled:
     defines += "#define DOCTEST_CONFIG_DISABLE\n"
 if args.catch and args.fast:
     defines += "#define CATCH_CONFIG_FAST_COMPILE\n"

scripts/bench/tests.json

diff --git a/scripts/bench/tests.json b/scripts/bench/tests.json
index e2c537e..5c882f6 100644
--- a/scripts/bench/tests.json
+++ b/scripts/bench/tests.json
@@ -19,7 +19,7 @@
             ["any",     " --files 200 --tests 0"],
             ["any",     " --files 200 --tests 0 --implement"],
             ["any",     " --files 200 --tests 0 --implement --header"],
-            ["doctest", " --files 200 --tests 0 --implement --header --disabled"]
+            ["any",     " --files 200 --tests 0 --implement --header --disabled"]
         ]
     ],
     "asserts": [
@@ -30,7 +30,7 @@
             ["doctest", " --header --files 10 --tests 50 --checks 100 --asserts binary"],
             ["doctest", " --header --files 10 --tests 50 --checks 100 --asserts fast"],
             ["doctest", " --header --files 10 --tests 50 --checks 100 --asserts fast   --fast"],
-            ["doctest", " --header --files 10 --tests 50 --checks 100 --asserts normal --disabled"],
+            ["any",     " --header --files 10 --tests 50 --checks 100 --asserts normal --disabled"],
             ["catch",   " --header --files 10 --tests 50 --checks 100 --asserts normal --fast"]
         ]
     ],