Skip to content

Use rustpkg #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eholk merged 10 commits into from
Nov 13, 2013
Merged

Use rustpkg #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
efd1b68
Using rustpkg. Not all tests are enabled yet.
eholk Nov 4, 2013
82b3049
Moving the rest of the tests to test.rs.
eholk Nov 4, 2013
07255ee
This is the only part that exposes the type inference bug.
eholk Nov 4, 2013
0c2992b
Merging with master
eholk Nov 6, 2013
0da227a
Re-enabling the mem tests.
eholk Nov 6, 2013
a515b82
Merging with master.
eholk Nov 12, 2013
e872122
Merge branch 'master' into rustpkg
eholk Nov 12, 2013
8c8ab6b
Adding link information to test.rs too.
eholk Nov 12, 2013
b76d2d2
Remove Unique.
eholk Nov 12, 2013
cc0eaca
Removing duplicate macros and unused imports.
eholk Nov 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
*.dSYM
test
opencl-test
build
.rust
bin
16 changes: 8 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ ifndef RUSTC
RUSTC = rustc
endif

ifndef RUSTPKG
RUSTPKG = rustpkg
endif

OPENCL_SRC = \
lib.rs \
CL.rs \
Expand All @@ -16,13 +20,9 @@ OPENCL_SRC = \
all: libOpenCL opencl-test

.PHONY: libOpenCL
libOpenCL : $(OPENCL_SRC)
$(RUSTC) -O --lib lib.rs
libOpenCL :
$(RUSTPKG) build OpenCL

.PHONY: check
check: opencl-test
RUST_THREADS=1 ./opencl-test

opencl-test : libOpenCL test.rs
$(RUSTC) -L . test.rs
$(RUSTC) -O --test --cfg test lib.rs -o opencl-test
check:
RUST_THREADS=1 $(RUSTPKG) test OpenCL
Loading