Skip to content

Commit

Permalink
Fix pip install hanging by moving C tests out of build.sh. (ray-proje…
Browse files Browse the repository at this point in the history
…ct#52)

* Remove C tests from build.sh.

* Run C tests in Travis.
  • Loading branch information
robertnishihara authored and pcmoritz committed Nov 21, 2016
1 parent f267da6 commit 9ed56c2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
10 changes: 9 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,15 @@ matrix:
install:
- ./install-dependencies.sh
- ./build.sh


- cd src/common
- make test
- cd ../..

- cd src/plasma
- make test
- cd ../..

- cd numbuf
- sudo python setup.py install
- cd ..
Expand Down
2 changes: 0 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,12 @@ PYTHON_GLOBAL_SCHEDULER_DIR="$PYTHON_DIR/global_scheduler"
pushd "$COMMON_DIR"
make clean
make
make test
popd
cp "$COMMON_DIR/thirdparty/redis-3.2.3/src/redis-server" "$PYTHON_COMMON_DIR/thirdparty/redis-3.2.3/src/"

pushd "$PLASMA_DIR"
make clean
make
make test
pushd "$PLASMA_DIR/build"
cmake ..
make install
Expand Down
2 changes: 1 addition & 1 deletion src/common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CC = gcc
CFLAGS = -g -Wall -Wno-typedef-redefinition --std=c99 -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=200809L -fPIC -I. -Ithirdparty -Ithirdparty/ae
BUILD = build

all: hiredis $(BUILD)/libcommon.a
all: hiredis redis $(BUILD)/libcommon.a

$(BUILD)/libcommon.a: event_loop.o common.o task.o io.o net.o state/redis.o state/table.o state/object_table.o state/task_table.o state/db_client_table.o thirdparty/ae/ae.o thirdparty/sha256.o
ar rcs $@ $^
Expand Down

0 comments on commit 9ed56c2

Please sign in to comment.