Made yw-cli-tests run with gcc and ccputest.

yesworkflow-org · Sep 25, 2017 · bfe702a · bfe702a
1 parent 6007a94
commit bfe702a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/gcc/yw-cli-tests/Makefile b/gcc/yw-cli-tests/Makefile
@@ -0,0 +1,7 @@
+include ../yw.setup.makefile
+include ../cpp.setup.makefile
+include ../tests.setup.makefile
+
+TESTS = $(wildcard $(YW_TEST_DIR)/yw-cli-tests/*.cpp)
+
+include ../test.targets.makefile
diff --git a/gcc/yw-cli-tests/test_runner.cpp b/gcc/yw-cli-tests/test_runner.cpp
@@ -0,0 +1,7 @@
+#include "CppUTest/CommandLineTestRunner.h"
+
+int main(int ac, char** av)
+{
+    MemoryLeakWarningPlugin::turnOffNewDeleteOverloads();
+    return CommandLineTestRunner::RunAllTests(ac, av);
+}
diff --git a/msvc/yw.sln b/msvc/yw.sln
@@ -226,6 +226,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yw-cli", "yw-cli", "{9265BA
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yw-cli-tests", "yw-cli-tests", "{F1EC2F6B-014F-4064-B2C5-F37172E156E9}"
+	ProjectSection(SolutionItems) = preProject
+		..\gcc\yw-cli-tests\Makefile = ..\gcc\yw-cli-tests\Makefile
+		..\gcc\yw-cli-tests\test_runner.cpp = ..\gcc\yw-cli-tests\test_runner.cpp
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/test/yw-cli-tests/command_line_context_tests.cpp b/test/yw-cli-tests/command_line_context_tests.cpp
@@ -4,7 +4,7 @@ using namespace yw;
 using namespace yw::cli;
 using namespace yw::test;
 
-YW_TEST_FIXTURE(BeginContext)
+YW_TEST_FIXTURE(CommandLineContext)
 
     StderrRecorder stderrRecorder;
 

diff --git a/test/yw-cli-tests/command_line_tests.cpp b/test/yw-cli-tests/command_line_tests.cpp
@@ -4,7 +4,7 @@ using namespace yw;
 using namespace yw::cli;
 using namespace yw::test;
 
-YW_TEST_FIXTURE(BeginContext)
+YW_TEST_FIXTURE(CommandLine)
 
     StderrRecorder stderrRecorder;
 

diff --git a/test/yw-config-tests/yw_config_tests.h b/test/yw-config-tests/yw_config_tests.h
@@ -7,5 +7,5 @@
 #include <iostream>
 #include <sstream>
 
-#include "yw_test.h"
 #include "yw_config.h"
+#include "yw_test.h"