reapack

commit 594ef097c64cac2d99e0e82c490a66e4630018a7
parent 85d17ea4173f7958290ba3228908295a48dcca2c
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Thu, 17 Dec 2015 12:27:51 -0500

execute the test suite from the build script

Diffstat:
M
README.md
 | 
4
++--
M
Tupfile
 | 
1
+
M
macosx.tup
 | 
4
+++-
M
win32.tup
 | 
3
++-

4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ vendor
 1. Install [Homebrew](http://brew.sh/) and Xcode Command Line Tools
 2. Install [tup](http://gittup.org/tup/) and [boost](http://www.boost.org/):
   `brew tap homebrew/fuse && brew install tup boost`
-3. Run `tup --quiet && x64/bin/test` from this directory
+3. Run `tup --quiet` from this directory
 4. Copy or link `x64/bin/reaper_reapack_x64.dylib` to REAPER's extension
   directory (replace x64 with x86 for 32-bit)
 
@@ -64,7 +64,7 @@ vendor
   to `<reapack directory>\vendor` as `libcurl_x64`
 6. Copy `<curl directory>\builds\libcurl-vc-x86-release-static-ipv6-sspi-winssl`
   to `<reapack directory>\vendor` as `libcurl_x86`
-7. Run `tup --quiet && x64\bin\test` from this directory using
+7. Run `tup --quiet` from this directory using
   "Developer Command Prompt for VS2013"
 8. Copy `x64\bin\reaper_reapack_x64.dll` to your REAPER
   plugin folder (replace x64 with x86 for 32-bit)
diff --git a/Tupfile b/Tupfile
@@ -13,3 +13,4 @@ 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
@@ -20,7 +20,9 @@ LDFLAGS := -framework Cocoa -framework Carbon -lcurl
 
 SOFLAGS := -dynamiclib
 SOTARGET := bin/reaper_reapack_@(OSXARCH).dylib
-TSTARGET := bin/test
+
+TEST := bin/test
+TSTARGET := $(TEST)
 
 !build = |> $(CXX) $(CXXFLAGS) -c %f -o %o |>
 !link = |> $(CXX) $(CXXFLAGS) %f $(LDFLAGS) -o %o |>
diff --git a/win32.tup b/win32.tup
@@ -21,7 +21,8 @@ SOFLAGS := /DLL /OUT:$(TUP_VARIANTDIR)/bin/reaper_reapack_@(WINARCH).dll
 SOTARGET := bin/reaper_reapack_@(WINARCH).dll
 SOTARGET += bin/reaper_reapack_@(WINARCH).lib bin/reaper_reapack_@(WINARCH).exp
 
-TSFLAGS := /OUT:$(TUP_VARIANTDIR)/bin/test.exe
+TEST := $(TUP_VARIANTDIR)/bin/test.exe
+TSFLAGS := /OUT:$(TEST)
 TSTARGET := bin/test.exe bin/test.lib bin/test.exp
 
 LINKDEPS := src/resource.res