commit 862a3bb8a934ef5a097db1b1a4be7db585004532
author onqtam <vik.kirilov@gmail.com> Wed Apr 27 18:19:00 2016 +0300
committer onqtam <vik.kirilov@gmail.com> Tue May 03 19:03:39 2016 +0300
tree af5ffe2adfaf64be2bdd4f8d37d238bad42c9a65
parent aba77b99fa8aa6370df58a8088073afb8af042d4

fixed refactoring of options parsing
added _CONFIG_ in config macros for the library

examples/dev_testing/main.cpp

diff --git a/examples/dev_testing/main.cpp b/examples/dev_testing/main.cpp
index 08da086..af9f99f 100644
--- a/examples/dev_testing/main.cpp
+++ b/examples/dev_testing/main.cpp
@@ -1,7 +1,7 @@
-//#define DOCTEST_DISABLE

+//#define DOCTEST_CONFIG_DISABLE

 

 //#include "doctest.h"

-#define DOCTEST_IMPLEMENT

+#define DOCTEST_CONFIG_IMPLEMENT

 #include "doctest.h"

 

 #include <cstdio>

@@ -12,7 +12,7 @@
 

     // overrides

     context.setOption("dt-case-sensitive", true);

-    context.setOption("dt-no-breaks", true);

+    context.setOption("no-breaks", true);

     //context.setOption("dt-no-colors", true);

     context.addFilter("dt-name", "zzz");

 

examples/dev_testing/test.cpp

diff --git a/examples/dev_testing/test.cpp b/examples/dev_testing/test.cpp
index 2cfa23e..14b9e04 100644
--- a/examples/dev_testing/test.cpp
+++ b/examples/dev_testing/test.cpp
@@ -1,4 +1,4 @@
-//#define DOCTEST_DISABLE

+//#define DOCTEST_CONFIG_DISABLE

 

 #include "doctest.h"

 

examples/disabled/main.cpp

diff --git a/examples/disabled/main.cpp b/examples/disabled/main.cpp
index 72a55d4..f047fd9 100644
--- a/examples/disabled/main.cpp
+++ b/examples/disabled/main.cpp
@@ -1,6 +1,6 @@
-#define DOCTEST_DISABLE

+#define DOCTEST_CONFIG_DISABLE

 

-#define DOCTEST_IMPLEMENT_WITH_MAIN

+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN

 #include "doctest.h"

 

 #include <cstdio>

examples/hello_world/main.cpp

diff --git a/examples/hello_world/main.cpp b/examples/hello_world/main.cpp
index 593b0de..1888cd3 100644
--- a/examples/hello_world/main.cpp
+++ b/examples/hello_world/main.cpp
@@ -1,4 +1,4 @@
-#define DOCTEST_IMPLEMENT_WITH_MAIN

+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN

 #include "doctest.h"

 

 #include <cstdio>

examples/multi_dll/common.h

diff --git a/examples/multi_dll/common.h b/examples/multi_dll/common.h
index 1ee40bc..f80f65c 100644
--- a/examples/multi_dll/common.h
+++ b/examples/multi_dll/common.h
@@ -27,7 +27,7 @@
   #endif

 #endif

 

-#define DOCTEST_IMPLEMENT

+#define DOCTEST_CONFIG_IMPLEMENT

 #include "doctest.h"

 

 #include <cstdio>

examples/multiprocess/main.cpp

diff --git a/examples/multiprocess/main.cpp b/examples/multiprocess/main.cpp
index 68eee7d..a2e32d3 100644
--- a/examples/multiprocess/main.cpp
+++ b/examples/multiprocess/main.cpp
@@ -1,4 +1,4 @@
-#define DOCTEST_IMPLEMENT_WITH_MAIN

+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN

 #include "doctest.h"

 

 //system("timeout /t 1 /nobreak");

examples/stress_test/main.cpp

diff --git a/examples/stress_test/main.cpp b/examples/stress_test/main.cpp
index 605ef5b..5bf4cfb 100644
--- a/examples/stress_test/main.cpp
+++ b/examples/stress_test/main.cpp
@@ -1,4 +1,4 @@
-#define DOCTEST_IMPLEMENT_WITH_MAIN

+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN

 #include "doctest.h"

 #include "stress.inl"

 #include "stress.inl"

examples/type_reporting/main.cpp

diff --git a/examples/type_reporting/main.cpp b/examples/type_reporting/main.cpp
index 764bea7..692482f 100644
--- a/examples/type_reporting/main.cpp
+++ b/examples/type_reporting/main.cpp
@@ -1,4 +1,4 @@
-#define DOCTEST_IMPLEMENT_WITH_MAIN

+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN

 #include "doctest.h"

 

 #include <climits>