From 456bbf1d3589215d5553ba2d17da4899c767b961 Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Wed, 21 Nov 2012 22:45:03 +0100 Subject: [PATCH 1/3] Add trivial Makefile to run tests. --- projects/SelfTest/Makefile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 projects/SelfTest/Makefile diff --git a/projects/SelfTest/Makefile b/projects/SelfTest/Makefile new file mode 100644 index 00000000..7acfc447 --- /dev/null +++ b/projects/SelfTest/Makefile @@ -0,0 +1,18 @@ +SOURCES = ApproxTests.cpp ClassTests.cpp ConditionTests.cpp \ + ExceptionTests.cpp GeneratorTests.cpp MessageTests.cpp \ + MiscTests.cpp TestMain.cpp TrickyTests.cpp \ + catch_self_test.cpp +OBJECTS = $(patsubst %.cpp, %.o, $(SOURCES)) + +CXXFLAGS = -I../../include + +main: $(OBJECTS) + $(CXX) -o $@ $^ + +junit: main + ./main -r junit > junit.xml + +clean: + rm -f $(OBJECTS) main junit.xml + +.PHONY: main junit From f9971cfc0f88a5f4a76f57a38f2c71b4f930cc89 Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Wed, 21 Nov 2012 23:01:40 +0100 Subject: [PATCH 2/3] Ignore exitcode from testrunner. --- projects/SelfTest/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SelfTest/Makefile b/projects/SelfTest/Makefile index 7acfc447..1ce5ca41 100644 --- a/projects/SelfTest/Makefile +++ b/projects/SelfTest/Makefile @@ -10,7 +10,7 @@ main: $(OBJECTS) $(CXX) -o $@ $^ junit: main - ./main -r junit > junit.xml + -./main -r junit > junit.xml clean: rm -f $(OBJECTS) main junit.xml From 22b5a157b0f3f3054cacde5a40bf6914a806a7fd Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Mon, 3 Dec 2012 16:05:24 +0100 Subject: [PATCH 3/3] Remove execute results --- projects/SelfTest/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/projects/SelfTest/Makefile b/projects/SelfTest/Makefile index 1ce5ca41..01e21634 100644 --- a/projects/SelfTest/Makefile +++ b/projects/SelfTest/Makefile @@ -9,10 +9,7 @@ CXXFLAGS = -I../../include main: $(OBJECTS) $(CXX) -o $@ $^ -junit: main - -./main -r junit > junit.xml - clean: - rm -f $(OBJECTS) main junit.xml + rm -f $(OBJECTS) main -.PHONY: main junit +.PHONY: main clean