diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2018-09-25 17:05:40 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2018-09-25 17:05:40 +0200 |
| commit | a7a25e9f45778920935c587b9cab4539ac34600e (patch) | |
| tree | d7d57485be7c427729b9b99b3a4b2f7c2b243816 | |
| parent | d06a9eb183d8208bb8be30c8342fa5500973ac8c (diff) | |
| download | uriparser-a7a25e9f45778920935c587b9cab4539ac34600e.tar.gz | |
Remove misc CppTest leftovers
| -rw-r--r-- | GOALS.txt | 4 | ||||
| -rwxr-xr-x | scripts/release.sh | 1 | ||||
| -rw-r--r-- | win32/Code_Blocks/test.cbp | 22 | ||||
| -rw-r--r-- | win32/MinGW/Makefile | 4 | ||||
| -rw-r--r-- | win32/Visual_Studio_2005/test.vcproj | 96 |
5 files changed, 3 insertions, 124 deletions
@@ -34,8 +34,8 @@ (10) #include "xxx" for files in same folder.
#include <xxx> for files from include folders.
-(11) Use CppTest for unit testing.
- http://sourceforge.net/projects/cpptest
+(11) Use GoogleTest for unit testing.
+ https://github.com/google/googletest
(12) Implement algorithm for reference resolution
diff --git a/scripts/release.sh b/scripts/release.sh index c444644..cbe18f1 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -15,7 +15,6 @@ echo ========== bootstrap ========== echo echo ========== configure ========== configure_flags=( - CPPFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 # to address cpptest link errors --enable-doc ) ./configure "${configure_flags[@]}" || exit 1 diff --git a/win32/Code_Blocks/test.cbp b/win32/Code_Blocks/test.cbp index 19c6fca..ec3cb5c 100644 --- a/win32/Code_Blocks/test.cbp +++ b/win32/Code_Blocks/test.cbp @@ -32,28 +32,6 @@ <Unit filename="..\..\include\uriparser\UriDefsConfig.h" /> <Unit filename="..\..\include\uriparser\UriDefsUnicode.h" /> <Unit filename="..\..\include\uriparser\UriIp4.h" /> - <Unit filename="..\CppTest\collectoroutput.cpp" /> - <Unit filename="..\CppTest\compileroutput.cpp" /> - <Unit filename="..\CppTest\cpptest-assert.h" /> - <Unit filename="..\CppTest\cpptest-collectoroutput.h" /> - <Unit filename="..\CppTest\cpptest-compileroutput.h" /> - <Unit filename="..\CppTest\cpptest-htmloutput.h" /> - <Unit filename="..\CppTest\cpptest-output.h" /> - <Unit filename="..\CppTest\cpptest-source.h" /> - <Unit filename="..\CppTest\cpptest-suite.h" /> - <Unit filename="..\CppTest\cpptest-textoutput.h" /> - <Unit filename="..\CppTest\cpptest-time.h" /> - <Unit filename="..\CppTest\cpptest.h" /> - <Unit filename="..\CppTest\htmloutput.cpp" /> - <Unit filename="..\CppTest\missing.cpp" /> - <Unit filename="..\CppTest\missing.h" /> - <Unit filename="..\CppTest\source.cpp" /> - <Unit filename="..\CppTest\suite.cpp" /> - <Unit filename="..\CppTest\textoutput.cpp" /> - <Unit filename="..\CppTest\time.cpp" /> - <Unit filename="..\CppTest\utils.cpp" /> - <Unit filename="..\CppTest\utils.h" /> - <Unit filename="..\CppTest\winconfig.h" /> <Unit filename="..\..\test\FourSuite.cpp" /> <Unit filename="..\..\test\test.cpp" /> <Extensions> diff --git a/win32/MinGW/Makefile b/win32/MinGW/Makefile index 16e361d..09d929c 100644 --- a/win32/MinGW/Makefile +++ b/win32/MinGW/Makefile @@ -40,7 +40,6 @@ CFLAGS = -Wall -Wextra -O3 -s TEST_DIR = ../../test -CPP_TEST_DIR = ../CppTest LIB_DIR = ../../src INCLUDE_DIR = ../../include WIN32_DIR = .. @@ -49,8 +48,7 @@ CXX = g++ dos = $(subst /,\,$(1)) URIPARSER_OBJECTS := $(patsubst %.c,%.o,$(wildcard $(LIB_DIR)/*.c)) -TEST_OBJECTS := $(patsubst %.cpp,%.o,$(wildcard $(CPP_TEST_DIR)/*.cpp)) \ - $(patsubst %.cpp,%.o,$(wildcard $(TEST_DIR)/*.cpp)) +TEST_OBJECTS := $(patsubst %.cpp,%.o,$(wildcard $(TEST_DIR)/*.cpp)) LIBRARY = $(WIN32_DIR)/liburiparser.a TEST_SUITE = $(WIN32_DIR)/test.exe diff --git a/win32/Visual_Studio_2005/test.vcproj b/win32/Visual_Studio_2005/test.vcproj index ead7260..4971e13 100644 --- a/win32/Visual_Studio_2005/test.vcproj +++ b/win32/Visual_Studio_2005/test.vcproj @@ -220,102 +220,6 @@ RelativePath="..\..\test\test.cpp"
>
</File>
- <Filter
- Name="CppTest"
- >
- <File
- RelativePath="..\CppTest\collectoroutput.cpp"
- >
- </File>
- <File
- RelativePath="..\CppTest\compileroutput.cpp"
- >
- </File>
- <File
- RelativePath="..\CppTest\config.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\cpptest-assert.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\cpptest-collectoroutput.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\cpptest-compileroutput.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\cpptest-htmloutput.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\cpptest-output.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\cpptest-source.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\cpptest-suite.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\cpptest-textoutput.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\cpptest-time.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\cpptest.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\htmloutput.cpp"
- >
- </File>
- <File
- RelativePath="..\CppTest\missing.cpp"
- >
- </File>
- <File
- RelativePath="..\CppTest\missing.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\source.cpp"
- >
- </File>
- <File
- RelativePath="..\CppTest\suite.cpp"
- >
- </File>
- <File
- RelativePath="..\CppTest\textoutput.cpp"
- >
- </File>
- <File
- RelativePath="..\CppTest\time.cpp"
- >
- </File>
- <File
- RelativePath="..\CppTest\utils.cpp"
- >
- </File>
- <File
- RelativePath="..\CppTest\utils.h"
- >
- </File>
- <File
- RelativePath="..\CppTest\winconfig.h"
- >
- </File>
- </Filter>
</Filter>
</Files>
<Globals>
|