Skip to content

Commit 02513e8

Browse files
basvoddebasvodde
authored
Merge pull request cpputest#1059 from Andne/test-loc
Match tests folder to src and include folders
2 parents b2e8923 + a442760 commit 02513e8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+227
-225
lines changed

‎CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ if (EXTENSIONS)
7575
endif (EXTENSIONS)
7676

7777
if (TESTS)
78-
add_subdirectory(tests)
78+
add_subdirectory(tests/CppUTest)
79+
if (EXTENSIONS)
80+
add_subdirectory(tests/CppUTestExt)
81+
endif (EXTENSIONS)
7982
endif (TESTS)
8083

8184
set (INCLUDE_INSTALL_DIR "include")

‎Makefile.am

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -136,38 +136,38 @@ CppUTestTests_LDADD = lib/libCppUTest.a $(CPPUTEST_LDADD)
136136
CppUTestTests_LDFLAGS = $(AM_LDFLAGS) $(CPPUTEST_LDFLAGS) $(CPPUTEST_ADDITIONAL_LDFLAGS)
137137

138138
CppUTestTests_SOURCES = \
139-
tests/AllocationInCFile.c \
140-
tests/AllocationInCppFile.cpp \
141-
tests/AllocLetTestFree.c \
142-
tests/AllocLetTestFreeTest.cpp \
143-
tests/AllTests.cpp \
144-
tests/CheatSheetTest.cpp \
145-
tests/CommandLineArgumentsTest.cpp \
146-
tests/CommandLineTestRunnerTest.cpp \
147-
tests/JUnitOutputTest.cpp \
148-
tests/MemoryLeakDetectorTest.cpp \
149-
tests/MemoryOperatorOverloadTest.cpp \
150-
tests/MemoryLeakWarningTest.cpp \
151-
tests/PluginTest.cpp \
152-
tests/PreprocessorTest.cpp \
153-
tests/SetPluginTest.cpp \
154-
tests/SimpleStringTest.cpp \
155-
tests/SimpleMutexTest.cpp \
156-
tests/TeamCityOutputTest.cpp \
157-
tests/TestFailureNaNTest.cpp \
158-
tests/TestFailureTest.cpp \
159-
tests/TestFilterTest.cpp \
160-
tests/TestHarness_cTest.cpp \
161-
tests/TestHarness_cTestCFile.c \
162-
tests/TestInstallerTest.cpp \
163-
tests/TestMemoryAllocatorTest.cpp \
164-
tests/TestOutputTest.cpp \
165-
tests/TestRegistryTest.cpp \
166-
tests/TestResultTest.cpp \
167-
tests/TestUTestMacro.cpp \
168-
tests/TestUTestStringMacro.cpp \
169-
tests/UtestTest.cpp \
170-
tests/UtestPlatformTest.cpp
139+
tests/CppUTest/AllocationInCFile.c \
140+
tests/CppUTest/AllocationInCppFile.cpp \
141+
tests/CppUTest/AllocLetTestFree.c \
142+
tests/CppUTest/AllocLetTestFreeTest.cpp \
143+
tests/CppUTest/AllTests.cpp \
144+
tests/CppUTest/CheatSheetTest.cpp \
145+
tests/CppUTest/CommandLineArgumentsTest.cpp \
146+
tests/CppUTest/CommandLineTestRunnerTest.cpp \
147+
tests/CppUTest/JUnitOutputTest.cpp \
148+
tests/CppUTest/MemoryLeakDetectorTest.cpp \
149+
tests/CppUTest/MemoryOperatorOverloadTest.cpp \
150+
tests/CppUTest/MemoryLeakWarningTest.cpp \
151+
tests/CppUTest/PluginTest.cpp \
152+
tests/CppUTest/PreprocessorTest.cpp \
153+
tests/CppUTest/SetPluginTest.cpp \
154+
tests/CppUTest/SimpleStringTest.cpp \
155+
tests/CppUTest/SimpleMutexTest.cpp \
156+
tests/CppUTest/TeamCityOutputTest.cpp \
157+
tests/CppUTest/TestFailureNaNTest.cpp \
158+
tests/CppUTest/TestFailureTest.cpp \
159+
tests/CppUTest/TestFilterTest.cpp \
160+
tests/CppUTest/TestHarness_cTest.cpp \
161+
tests/CppUTest/TestHarness_cTestCFile.c \
162+
tests/CppUTest/TestInstallerTest.cpp \
163+
tests/CppUTest/TestMemoryAllocatorTest.cpp \
164+
tests/CppUTest/TestOutputTest.cpp \
165+
tests/CppUTest/TestRegistryTest.cpp \
166+
tests/CppUTest/TestResultTest.cpp \
167+
tests/CppUTest/TestUTestMacro.cpp \
168+
tests/CppUTest/TestUTestStringMacro.cpp \
169+
tests/CppUTest/UtestTest.cpp \
170+
tests/CppUTest/UtestPlatformTest.cpp
171171

172172
CppUTestExtTests_CPPFLAGS = $(lib_libCppUTestExt_a_CPPFLAGS)
173173
CppUTestExtTests_CFLAGS = $(lib_libCppUTestExt_a_CFLAGS)

‎Makefile_using_MakefileWorker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SRC_DIRS = \
1818
src/Platforms/$(CPP_PLATFORM)
1919

2020
TEST_SRC_DIRS = \
21-
tests
21+
tests/CppUTest
2222

2323
INCLUDE_DIRS =\
2424
include

‎platforms/Dos/sources.mk

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -37,45 +37,45 @@ CPPUX_OBJECTS := \
3737
$(CPPUTEST_HOME)/src/CppUTestExt/MockSupport.o \
3838

3939
CPPU1_OBJECTS := \
40-
$(CPPUTEST_HOME)/tests/AllTests.o \
41-
$(CPPUTEST_HOME)/tests/AllocLetTestFree.o \
42-
$(CPPUTEST_HOME)/tests/AllocLetTestFreeTest.o \
43-
$(CPPUTEST_HOME)/tests/CheatSheetTest.o \
44-
$(CPPUTEST_HOME)/tests/CommandLineArgumentsTest.o \
45-
$(CPPUTEST_HOME)/tests/CommandLineTestRunnerTest.o \
46-
$(CPPUTEST_HOME)/tests/JUnitOutputTest.o \
47-
$(CPPUTEST_HOME)/tests/MemoryLeakWarningTest.o \
48-
$(CPPUTEST_HOME)/tests/PluginTest.o \
49-
$(CPPUTEST_HOME)/tests/PreprocessorTest.o \
50-
$(CPPUTEST_HOME)/tests/SetPluginTest.o \
51-
$(CPPUTEST_HOME)/tests/SimpleMutexTest.o \
52-
$(CPPUTEST_HOME)/tests/TeamCityOutputTest.o \
53-
$(CPPUTEST_HOME)/tests/TestFailureNaNTest.o \
54-
$(CPPUTEST_HOME)/tests/TestFailureTest.o \
55-
$(CPPUTEST_HOME)/tests/TestResultTest.o \
40+
$(CPPUTEST_HOME)/tests/CppUTest/AllTests.o \
41+
$(CPPUTEST_HOME)/tests/CppUTest/AllocLetTestFree.o \
42+
$(CPPUTEST_HOME)/tests/CppUTest/AllocLetTestFreeTest.o \
43+
$(CPPUTEST_HOME)/tests/CppUTest/CheatSheetTest.o \
44+
$(CPPUTEST_HOME)/tests/CppUTest/CommandLineArgumentsTest.o \
45+
$(CPPUTEST_HOME)/tests/CppUTest/CommandLineTestRunnerTest.o \
46+
$(CPPUTEST_HOME)/tests/CppUTest/JUnitOutputTest.o \
47+
$(CPPUTEST_HOME)/tests/CppUTest/MemoryLeakWarningTest.o \
48+
$(CPPUTEST_HOME)/tests/CppUTest/PluginTest.o \
49+
$(CPPUTEST_HOME)/tests/CppUTest/PreprocessorTest.o \
50+
$(CPPUTEST_HOME)/tests/CppUTest/SetPluginTest.o \
51+
$(CPPUTEST_HOME)/tests/CppUTest/SimpleMutexTest.o \
52+
$(CPPUTEST_HOME)/tests/CppUTest/TeamCityOutputTest.o \
53+
$(CPPUTEST_HOME)/tests/CppUTest/TestFailureNaNTest.o \
54+
$(CPPUTEST_HOME)/tests/CppUTest/TestFailureTest.o \
55+
$(CPPUTEST_HOME)/tests/CppUTest/TestResultTest.o \
5656

5757
CPPU2_OBJECTS := \
58-
$(CPPUTEST_HOME)/tests/AllTests.o \
59-
$(CPPUTEST_HOME)/tests/MemoryLeakDetectorTest.o \
60-
$(CPPUTEST_HOME)/tests/SimpleStringTest.o \
61-
$(CPPUTEST_HOME)/tests/TestOutputTest.o \
62-
$(CPPUTEST_HOME)/tests/TestRegistryTest.o \
58+
$(CPPUTEST_HOME)/tests/CppUTest/AllTests.o \
59+
$(CPPUTEST_HOME)/tests/CppUTest/MemoryLeakDetectorTest.o \
60+
$(CPPUTEST_HOME)/tests/CppUTest/SimpleStringTest.o \
61+
$(CPPUTEST_HOME)/tests/CppUTest/TestOutputTest.o \
62+
$(CPPUTEST_HOME)/tests/CppUTest/TestRegistryTest.o \
6363

6464
CPPU3_OBJECTS := \
65-
$(CPPUTEST_HOME)/tests/AllTests.o \
66-
$(CPPUTEST_HOME)/tests/AllocationInCFile.o \
67-
$(CPPUTEST_HOME)/tests/AllocationInCppFile.o \
68-
$(CPPUTEST_HOME)/tests/MemoryOperatorOverloadTest.o \
69-
$(CPPUTEST_HOME)/tests/TeamCityOutputTest.o \
70-
$(CPPUTEST_HOME)/tests/TestFilterTest.o \
71-
$(CPPUTEST_HOME)/tests/TestHarness_cTest.o \
72-
$(CPPUTEST_HOME)/tests/TestHarness_cTestCFile.o \
73-
$(CPPUTEST_HOME)/tests/TestInstallerTest.o \
74-
$(CPPUTEST_HOME)/tests/TestMemoryAllocatorTest.o \
75-
$(CPPUTEST_HOME)/tests/TestUTestMacro.o \
76-
$(CPPUTEST_HOME)/tests/UtestPlatformTest.o \
77-
$(CPPUTEST_HOME)/tests/UtestTest.o \
78-
$(CPPUTEST_HOME)/tests/TestUTestStringMacro.o \
65+
$(CPPUTEST_HOME)/tests/CppUTest/AllTests.o \
66+
$(CPPUTEST_HOME)/tests/CppUTest/AllocationInCFile.o \
67+
$(CPPUTEST_HOME)/tests/CppUTest/AllocationInCppFile.o \
68+
$(CPPUTEST_HOME)/tests/CppUTest/MemoryOperatorOverloadTest.o \
69+
$(CPPUTEST_HOME)/tests/CppUTest/TeamCityOutputTest.o \
70+
$(CPPUTEST_HOME)/tests/CppUTest/TestFilterTest.o \
71+
$(CPPUTEST_HOME)/tests/CppUTest/TestHarness_cTest.o \
72+
$(CPPUTEST_HOME)/tests/CppUTest/TestHarness_cTestCFile.o \
73+
$(CPPUTEST_HOME)/tests/CppUTest/TestInstallerTest.o \
74+
$(CPPUTEST_HOME)/tests/CppUTest/TestMemoryAllocatorTest.o \
75+
$(CPPUTEST_HOME)/tests/CppUTest/TestUTestMacro.o \
76+
$(CPPUTEST_HOME)/tests/CppUTest/UtestPlatformTest.o \
77+
$(CPPUTEST_HOME)/tests/CppUTest/UtestTest.o \
78+
$(CPPUTEST_HOME)/tests/CppUTest/TestUTestStringMacro.o \
7979

8080
CPPUX1_OBJECTS := \
8181
$(CPPUTEST_HOME)/tests/CppUTestExt/AllTests.o \

‎scripts/appveyor_ci_test.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ switch -Wildcard ($env:Platform)
9595
$mingw_path = Get-MinGWBin
9696

9797
Add-PathFolder $mingw_path
98-
Invoke-Tests '.\cpputest_build\tests\CppUTestTests.exe'
98+
Invoke-Tests '.\cpputest_build\tests\CppUTest\CppUTestTests.exe'
9999
Invoke-Tests '.\cpputest_build\tests\CppUTestExt\CppUTestExtTests.exe'
100100
Remove-PathFolder $mingw_path
101101
}

0 commit comments

Comments
 (0)