reapack

commit 1915c1852273dced2591448b4eb9eec1702aaaae
parent be23ec87e25b8d7e320ddafb812c514586abf995
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Tue, 19 Jan 2016 12:17:19 -0500

run the test suite from rake at the very end of the build

Diffstat:
M
Rakefile
 | 
2
+-
M
Tupfile
 | 
1
-
M
macosx.tup
 | 
3
+--
M
win32.tup
 | 
3
+--

4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Rakefile b/Rakefile
@@ -1,4 +1,4 @@
-task :default => [:prepare, :build]
+task :default => [:prepare, :build, :test]
 
 desc 'Prepare the source code for building using prepare.rb'
 task :prepare do
diff --git a/Tupfile b/Tupfile
@@ -13,4 +13,3 @@ include @(TUP_PLATFORM).tup
 : foreach test/*.cpp |> !build -Isrc |> build/test/%B.o
 : foreach test/helper/*.cpp |> !build -Isrc |> build/test/helper_%B.o
 : build/*.o build/test/*.o | $(LINKDEPS) |> !link $(TSFLAGS) |> $(TSTARGET)
-: $(TSTARGET) |> $(TEST) --force-colour |>
diff --git a/macosx.tup b/macosx.tup
@@ -21,8 +21,7 @@ LDFLAGS := -framework Cocoa -framework Carbon -lcurl -lsqlite3
 SOFLAGS := -dynamiclib
 SOTARGET := bin/reaper_reapack_@(OSXARCH).dylib
 
-TEST := bin/test
-TSTARGET := $(TEST)
+TSTARGET := bin/test
 
 !build = |> $(CXX) $(CXXFLAGS) -c %f -o %o |>
 !link = |> $(CXX) $(CXXFLAGS) %f $(LDFLAGS) -o %o |>
diff --git a/win32.tup b/win32.tup
@@ -26,8 +26,7 @@ TARGET := bin/reaper_reapack_@(WINARCH)
 SOFLAGS := /DLL /OUT:$(TUP_VARIANTDIR)/$(TARGET).dll
 SOTARGET := $(TARGET).dll $(TARGET).lib $(TARGET).exp
 
-TEST := $(TUP_VARIANTDIR)/bin/test.exe
-TSFLAGS := /OUT:$(TEST)
+TSFLAGS := /OUT:$(TUP_VARIANTDIR)/bin/test.exe
 TSTARGET := bin/test.exe bin/test.lib bin/test.exp
 
 !build = |> $(CXX) $(CXXFLAGS) /c %f /Fo%o |>