Skip to content

Commit 594ef09

Browse files
committed
execute the test suite from the build script
1 parent 85d17ea commit 594ef09

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ vendor
3535
1. Install [Homebrew](http://brew.sh/) and Xcode Command Line Tools
3636
2. Install [tup](http://gittup.org/tup/) and [boost](http://www.boost.org/):
3737
`brew tap homebrew/fuse && brew install tup boost`
38-
3. Run `tup --quiet && x64/bin/test` from this directory
38+
3. Run `tup --quiet` from this directory
3939
4. Copy or link `x64/bin/reaper_reapack_x64.dylib` to REAPER's extension
4040
directory (replace x64 with x86 for 32-bit)
4141

@@ -64,7 +64,7 @@ vendor
6464
to `<reapack directory>\vendor` as `libcurl_x64`
6565
6. Copy `<curl directory>\builds\libcurl-vc-x86-release-static-ipv6-sspi-winssl`
6666
to `<reapack directory>\vendor` as `libcurl_x86`
67-
7. Run `tup --quiet && x64\bin\test` from this directory using
67+
7. Run `tup --quiet` from this directory using
6868
"Developer Command Prompt for VS2013"
6969
8. Copy `x64\bin\reaper_reapack_x64.dll` to your REAPER
7070
plugin folder (replace x64 with x86 for 32-bit)

Tupfile

+1
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ include @(TUP_PLATFORM).tup
1313
: foreach test/*.cpp |> !build -Isrc |> build/test/%B.o
1414
: foreach test/helper/*.cpp |> !build -Isrc |> build/test/helper_%B.o
1515
: build/*.o build/test/*.o | $(LINKDEPS) |> !link $(TSFLAGS) |> $(TSTARGET)
16+
: $(TSTARGET) |> $(TEST) --force-colour |>

macosx.tup

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ LDFLAGS := -framework Cocoa -framework Carbon -lcurl
2020

2121
SOFLAGS := -dynamiclib
2222
SOTARGET := bin/reaper_reapack_@(OSXARCH).dylib
23-
TSTARGET := bin/test
23+
24+
TEST := bin/test
25+
TSTARGET := $(TEST)
2426

2527
!build = |> $(CXX) $(CXXFLAGS) -c %f -o %o |>
2628
!link = |> $(CXX) $(CXXFLAGS) %f $(LDFLAGS) -o %o |>

win32.tup

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ SOFLAGS := /DLL /OUT:$(TUP_VARIANTDIR)/bin/reaper_reapack_@(WINARCH).dll
2121
SOTARGET := bin/reaper_reapack_@(WINARCH).dll
2222
SOTARGET += bin/reaper_reapack_@(WINARCH).lib bin/reaper_reapack_@(WINARCH).exp
2323

24-
TSFLAGS := /OUT:$(TUP_VARIANTDIR)/bin/test.exe
24+
TEST := $(TUP_VARIANTDIR)/bin/test.exe
25+
TSFLAGS := /OUT:$(TEST)
2526
TSTARGET := bin/test.exe bin/test.lib bin/test.exp
2627

2728
LINKDEPS := src/resource.res

0 commit comments

Comments
 (0)