no go

webern · Feb 6, 2020 · b36e91c · b36e91c
1 parent 2b557dd
commit b36e91c
Show file tree

Hide file tree

Showing 8 changed files with 17,632 additions and 6 deletions.
diff --git a/Sourcecode/private/cpul/catch.h b/Sourcecode/private/cpul/catch.h
diff --git a/Sourcecode/private/cpul/catchDefines.h b/Sourcecode/private/cpul/catchDefines.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "cpul/catch.h"
+
+#define TEST( a, b ) TEST_CASE( a, b )
diff --git a/Sourcecode/private/cpul/cpulDefines.h b/Sourcecode/private/cpul/cpulDefines.h
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #define PRIVATE_UNUSED_PARAMETER_STRINGIFY(argument) #argument
 
 #ifndef _MSC_VER

diff --git a/Sourcecode/private/cpul/cpulTest.cpp b/Sourcecode/private/cpul/cpulTest.cpp
@@ -1,3 +1,4 @@
+#if 0
 #include "cpul/cpulTest.h"
 #include "cpul/cpulTestRegistry.h"
 #include "cpul/cpulTestResult.h"
@@ -84,3 +85,4 @@ bool Test::getDoRunTest() const
     return doRunTest;
 }
 
+#endif
diff --git a/Sourcecode/private/cpul/cpulTest.h b/Sourcecode/private/cpul/cpulTest.h
@@ -1,3 +1,4 @@
+#if 0
 #ifndef TEST_H
 #define TEST_H
 
@@ -211,3 +212,4 @@ class Test
 
 
 #endif
+#endif
diff --git a/Sourcecode/private/cpul/cpulTestHarness.h b/Sourcecode/private/cpul/cpulTestHarness.h
@@ -2,16 +2,17 @@
 
 #include "cpul/cpulDefines.h"
 
-#ifdef USE_VS_TEST
+#define MX_USE_CATCH2
 
+#ifdef USE_VS_TEST
     #include "cpul/cpulVsTest.h"
-
+#elif defined(MX_USE_CATCH2)
+    #include "cpul/catch.h"
+    #include "cpul/catchDefines.h"
 #else
-
     #include "cpul/cpulTest.h"
     #include "cpul/cpulTestResult.h"
     #include "cpul/cpulFailure.h"
     #include "cpul/cpulTestRegistry.h"
-
 #endif
 
diff --git a/Sourcecode/private/cpul/main.cpp b/Sourcecode/private/cpul/main.cpp
@@ -1,3 +1,5 @@
+#define MX_USE_CATCH2
+
 #include <iostream>
 #include "cpul/cpulRun.h"
 #include "cpul/cpulTestTimer.h"

diff --git a/Sourcecode/private/mxtest/api/RoundTrip.h b/Sourcecode/private/mxtest/api/RoundTrip.h
@@ -5,9 +5,9 @@
 #pragma once
 
 #include "mxtest/control/CompileControl.h"
-
 #include "mx/api/DocumentManager.h"
 #include "mxtest/file/MxFileRepository.h"
+#include <sstream>
 
 namespace mxtest
 {