From 9ed56c23dbbbfa005fd256ce94b4019ce3c4a6ce Mon Sep 17 00:00:00 2001
From: Robert Nishihara <robertnishihara@gmail.com>
Date: Sun, 20 Nov 2016 21:02:54 -0800
Subject: [PATCH] Fix pip install hanging by moving C tests out of build.sh.
 (#52)

* Remove C tests from build.sh.

* Run C tests in Travis.
---
 .travis.yml         | 10 +++++++++-
 build.sh            |  2 --
 src/common/Makefile |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7e8293e8f..93953b75a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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 ..
diff --git a/build.sh b/build.sh
index 9b87f55c9..e5fa38bd6 100755
--- a/build.sh
+++ b/build.sh
@@ -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
diff --git a/src/common/Makefile b/src/common/Makefile
index a19ac1f19..6ccf38362 100644
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -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 $@ $^