Merge pull request #1379 from basvodde/master

Renamed InternalCacheTest so it can be included in DOS
cpputest · May 8, 2020 · 69301ea · 69301ea
2 parents e9c20f6 + 4950dc9
commit 69301ea
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -173,7 +173,7 @@ CppUTestTests_SOURCES = \
 	tests/CppUTest/PreprocessorTest.cpp \
 	tests/CppUTest/SetPluginTest.cpp \
 	tests/CppUTest/SimpleStringTest.cpp \
-	tests/CppUTest/SimpleStringInternalCacheTest.cpp \
+	tests/CppUTest/SimpleStringCacheTest.cpp \
 	tests/CppUTest/SimpleMutexTest.cpp \
 	tests/CppUTest/TeamCityOutputTest.cpp \
 	tests/CppUTest/TestFailureNaNTest.cpp \

diff --git a/platforms/CCStudio/CppUTestRunAllTests2.pjt b/platforms/CCStudio/CppUTestRunAllTests2.pjt
@@ -32,7 +32,7 @@ Source="..\..\src\CppUTest\TestTestingFixture.cpp"
 Source="..\..\src\CppUTest\Utest.cpp"
 Source="..\..\src\CppUTestExt\MockSupportPlugin.cpp"
 Source="..\..\src\Platforms\C2000\UtestPlatform.cpp"
-Source="..\..\tests\SimpleStringInternalCacheTest.cpp"
+Source="..\..\tests\SimpleStringCacheTest.cpp"
 Source="..\..\tests\TestFilterTest.cpp"
 Source="..\..\tests\TestHarness_cTest.cpp"
 Source="..\..\tests\TestHarness_cTestCFile.c"

diff --git a/platforms/Dos/sources.mk b/platforms/Dos/sources.mk
@@ -8,7 +8,6 @@ CPPU_OBJECTS := \
   $(CPPUTEST_HOME)/src/CppUTest/SimpleMutex.o \
   $(CPPUTEST_HOME)/src/CppUTest/SimpleString.o \
   $(CPPUTEST_HOME)/src/CppUTest/SimpleStringInternalCache.o \
-  $(CPPUTEST_HOME)/src/CppUTest/TeamCityTestOutput.o \
   $(CPPUTEST_HOME)/src/CppUTest/TestFailure.o \
   $(CPPUTEST_HOME)/src/CppUTest/TestFilter.o \
   $(CPPUTEST_HOME)/src/CppUTest/TestHarness_c.o \
@@ -62,8 +61,8 @@ CPPU2_OBJECTS := \
 CPPU3_OBJECTS := \
   $(CPPUTEST_HOME)/tests/CppUTest/AllTests.o \
   $(CPPUTEST_HOME)/tests/CppUTest/MemoryLeakDetectorTest.o \
-  $(CPPUTEST_HOME)/tests/CppUTest/SimpleStringTest.o
-#  $(CPPUTEST_HOME)/tests/CppUTest/SimpleStringInternalCacheTest.o
+  $(CPPUTEST_HOME)/tests/CppUTest/SimpleStringTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/SimpleStringCacheTest.o
 
 CPPU4_OBJECTS := \
   $(CPPUTEST_HOME)/tests/CppUTest/AllTests.o \

diff --git a/platforms/Eclipse-Cygwin/.project b/platforms/Eclipse-Cygwin/.project
@@ -785,9 +785,9 @@
 			<locationURI>PARENT-2-ECLIPSE_HOME/00_Dev/05_CppUTest/cpputest/tests/SetPluginTest.cpp</locationURI>
 		</link>
 		<link>
-			<name>tests/SimpleStringInternalCacheTest.cpp</name>
+			<name>tests/SimpleStringCacheTest.cpp</name>
 			<type>1</type>
-			<locationURI>PARENT-2-ECLIPSE_HOME/00_Dev/05_CppUTest/cpputest/tests/SimpleStringInternalCacheTest.cpp</locationURI>
+			<locationURI>PARENT-2-ECLIPSE_HOME/00_Dev/05_CppUTest/cpputest/tests/SimpleStringCacheTest.cpp</locationURI>
 		</link>
 		<link>
 			<name>tests/SimpleStringTest.cpp</name>

diff --git a/tests/CppUTest/CMakeLists.txt b/tests/CppUTest/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CppUTestTests_src
     SetPluginTest.cpp
     CheatSheetTest.cpp
     SimpleStringTest.cpp
-    SimpleStringInternalCacheTest.cpp
+    SimpleStringCacheTest.cpp
     CommandLineArgumentsTest.cpp
     TestFailureTest.cpp
     TestFailureNaNTest.cpp

diff --git a/...ppUTest/SimpleStringInternalCacheTest.cpp → tests/CppUTest/SimpleStringCacheTest.cpp b/...ppUTest/SimpleStringInternalCacheTest.cpp → tests/CppUTest/SimpleStringCacheTest.cpp