Merge pull request cpputest#1059 from Andne/test-loc

Match tests folder to src and include folders

CMakeLists.txt

@@ -75,7 +75,10 @@ if (EXTENSIONS)
 endif (EXTENSIONS)
 
 if (TESTS)
-    add_subdirectory(tests)
+    add_subdirectory(tests/CppUTest)
+    if (EXTENSIONS)
+        add_subdirectory(tests/CppUTestExt)
+    endif (EXTENSIONS)
 endif (TESTS)
 
 set (INCLUDE_INSTALL_DIR "include")

Makefile.am

@@ -136,38 +136,38 @@ CppUTestTests_LDADD = lib/libCppUTest.a $(CPPUTEST_LDADD)
 CppUTestTests_LDFLAGS = $(AM_LDFLAGS) $(CPPUTEST_LDFLAGS) $(CPPUTEST_ADDITIONAL_LDFLAGS)
 
 CppUTestTests_SOURCES = \
-	tests/AllocationInCFile.c \
-	tests/AllocationInCppFile.cpp \
-	tests/AllocLetTestFree.c \
-	tests/AllocLetTestFreeTest.cpp \
-	tests/AllTests.cpp \
-	tests/CheatSheetTest.cpp \
-	tests/CommandLineArgumentsTest.cpp \
-	tests/CommandLineTestRunnerTest.cpp \
-	tests/JUnitOutputTest.cpp \
-	tests/MemoryLeakDetectorTest.cpp \
-	tests/MemoryOperatorOverloadTest.cpp \
-	tests/MemoryLeakWarningTest.cpp \
-	tests/PluginTest.cpp \
-	tests/PreprocessorTest.cpp \
-	tests/SetPluginTest.cpp \
-	tests/SimpleStringTest.cpp \
-	tests/SimpleMutexTest.cpp \
-	tests/TeamCityOutputTest.cpp \
-	tests/TestFailureNaNTest.cpp \
-	tests/TestFailureTest.cpp \
-	tests/TestFilterTest.cpp \
-	tests/TestHarness_cTest.cpp \
-	tests/TestHarness_cTestCFile.c \
-	tests/TestInstallerTest.cpp \
-	tests/TestMemoryAllocatorTest.cpp \
-	tests/TestOutputTest.cpp \
-	tests/TestRegistryTest.cpp \
-	tests/TestResultTest.cpp \
-	tests/TestUTestMacro.cpp \
-	tests/TestUTestStringMacro.cpp \
-	tests/UtestTest.cpp \
-	tests/UtestPlatformTest.cpp
+	tests/CppUTest/AllocationInCFile.c \
+	tests/CppUTest/AllocationInCppFile.cpp \
+	tests/CppUTest/AllocLetTestFree.c \
+	tests/CppUTest/AllocLetTestFreeTest.cpp \
+	tests/CppUTest/AllTests.cpp \
+	tests/CppUTest/CheatSheetTest.cpp \
+	tests/CppUTest/CommandLineArgumentsTest.cpp \
+	tests/CppUTest/CommandLineTestRunnerTest.cpp \
+	tests/CppUTest/JUnitOutputTest.cpp \
+	tests/CppUTest/MemoryLeakDetectorTest.cpp \
+	tests/CppUTest/MemoryOperatorOverloadTest.cpp \
+	tests/CppUTest/MemoryLeakWarningTest.cpp \
+	tests/CppUTest/PluginTest.cpp \
+	tests/CppUTest/PreprocessorTest.cpp \
+	tests/CppUTest/SetPluginTest.cpp \
+	tests/CppUTest/SimpleStringTest.cpp \
+	tests/CppUTest/SimpleMutexTest.cpp \
+	tests/CppUTest/TeamCityOutputTest.cpp \
+	tests/CppUTest/TestFailureNaNTest.cpp \
+	tests/CppUTest/TestFailureTest.cpp \
+	tests/CppUTest/TestFilterTest.cpp \
+	tests/CppUTest/TestHarness_cTest.cpp \
+	tests/CppUTest/TestHarness_cTestCFile.c \
+	tests/CppUTest/TestInstallerTest.cpp \
+	tests/CppUTest/TestMemoryAllocatorTest.cpp \
+	tests/CppUTest/TestOutputTest.cpp \
+	tests/CppUTest/TestRegistryTest.cpp \
+	tests/CppUTest/TestResultTest.cpp \
+	tests/CppUTest/TestUTestMacro.cpp \
+	tests/CppUTest/TestUTestStringMacro.cpp \
+	tests/CppUTest/UtestTest.cpp \
+	tests/CppUTest/UtestPlatformTest.cpp
 
 CppUTestExtTests_CPPFLAGS = $(lib_libCppUTestExt_a_CPPFLAGS)
 CppUTestExtTests_CFLAGS = $(lib_libCppUTestExt_a_CFLAGS)

Makefile_using_MakefileWorker

@@ -18,7 +18,7 @@ SRC_DIRS = \
 	src/Platforms/$(CPP_PLATFORM)
 
 TEST_SRC_DIRS = \
-	tests
+	tests/CppUTest
 
 INCLUDE_DIRS =\
   include

platforms/Dos/sources.mk

@@ -37,45 +37,45 @@ CPPUX_OBJECTS := \
   $(CPPUTEST_HOME)/src/CppUTestExt/MockSupport.o \
 
 CPPU1_OBJECTS := \
-  $(CPPUTEST_HOME)/tests/AllTests.o \
-  $(CPPUTEST_HOME)/tests/AllocLetTestFree.o \
-  $(CPPUTEST_HOME)/tests/AllocLetTestFreeTest.o \
-  $(CPPUTEST_HOME)/tests/CheatSheetTest.o \
-  $(CPPUTEST_HOME)/tests/CommandLineArgumentsTest.o \
-  $(CPPUTEST_HOME)/tests/CommandLineTestRunnerTest.o \
-  $(CPPUTEST_HOME)/tests/JUnitOutputTest.o \
-  $(CPPUTEST_HOME)/tests/MemoryLeakWarningTest.o \
-  $(CPPUTEST_HOME)/tests/PluginTest.o \
-  $(CPPUTEST_HOME)/tests/PreprocessorTest.o \
-  $(CPPUTEST_HOME)/tests/SetPluginTest.o \
-  $(CPPUTEST_HOME)/tests/SimpleMutexTest.o \
-  $(CPPUTEST_HOME)/tests/TeamCityOutputTest.o \
-  $(CPPUTEST_HOME)/tests/TestFailureNaNTest.o \
-  $(CPPUTEST_HOME)/tests/TestFailureTest.o \
-  $(CPPUTEST_HOME)/tests/TestResultTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/AllTests.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/AllocLetTestFree.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/AllocLetTestFreeTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/CheatSheetTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/CommandLineArgumentsTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/CommandLineTestRunnerTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/JUnitOutputTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/MemoryLeakWarningTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/PluginTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/PreprocessorTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/SetPluginTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/SimpleMutexTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TeamCityOutputTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestFailureNaNTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestFailureTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestResultTest.o \
 
 CPPU2_OBJECTS := \
-  $(CPPUTEST_HOME)/tests/AllTests.o \
-  $(CPPUTEST_HOME)/tests/MemoryLeakDetectorTest.o \
-  $(CPPUTEST_HOME)/tests/SimpleStringTest.o \
-  $(CPPUTEST_HOME)/tests/TestOutputTest.o \
-  $(CPPUTEST_HOME)/tests/TestRegistryTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/AllTests.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/MemoryLeakDetectorTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/SimpleStringTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestOutputTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestRegistryTest.o \
 
 CPPU3_OBJECTS := \
-  $(CPPUTEST_HOME)/tests/AllTests.o \
-  $(CPPUTEST_HOME)/tests/AllocationInCFile.o \
-  $(CPPUTEST_HOME)/tests/AllocationInCppFile.o \
-  $(CPPUTEST_HOME)/tests/MemoryOperatorOverloadTest.o \
-  $(CPPUTEST_HOME)/tests/TeamCityOutputTest.o \
-  $(CPPUTEST_HOME)/tests/TestFilterTest.o \
-  $(CPPUTEST_HOME)/tests/TestHarness_cTest.o \
-  $(CPPUTEST_HOME)/tests/TestHarness_cTestCFile.o \
-  $(CPPUTEST_HOME)/tests/TestInstallerTest.o \
-  $(CPPUTEST_HOME)/tests/TestMemoryAllocatorTest.o \
-  $(CPPUTEST_HOME)/tests/TestUTestMacro.o \
-  $(CPPUTEST_HOME)/tests/UtestPlatformTest.o \
-  $(CPPUTEST_HOME)/tests/UtestTest.o \
-  $(CPPUTEST_HOME)/tests/TestUTestStringMacro.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/AllTests.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/AllocationInCFile.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/AllocationInCppFile.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/MemoryOperatorOverloadTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TeamCityOutputTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestFilterTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestHarness_cTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestHarness_cTestCFile.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestInstallerTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestMemoryAllocatorTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestUTestMacro.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/UtestPlatformTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/UtestTest.o \
+  $(CPPUTEST_HOME)/tests/CppUTest/TestUTestStringMacro.o \
 
 CPPUX1_OBJECTS := \
   $(CPPUTEST_HOME)/tests/CppUTestExt/AllTests.o \

scripts/appveyor_ci_test.ps1

@@ -95,7 +95,7 @@ switch -Wildcard ($env:Platform)
         $mingw_path = Get-MinGWBin
 
         Add-PathFolder $mingw_path
-        Invoke-Tests '.\cpputest_build\tests\CppUTestTests.exe'
+        Invoke-Tests '.\cpputest_build\tests\CppUTest\CppUTestTests.exe'
         Invoke-Tests '.\cpputest_build\tests\CppUTestExt\CppUTestExtTests.exe'
         Remove-PathFolder $mingw_path
     }