From 79a769c5841960dc755d0f233cd90a79a240fc2f Mon Sep 17 00:00:00 2001
From: Evan Shelhamer <shelhamer@imaginarynumber.net>
Date: Thu, 17 Jul 2014 11:57:56 +0200
Subject: [PATCH] switch travis build to CPU-only flag, drop runtestnogpu
 target

---
 .travis.yml | 3 ++-
 Makefile    | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c011975..17b483c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,10 +26,11 @@ before_script:
   - mv Makefile.config.example Makefile.config
   - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
   - export NUM_THREADS=4
+  - export CPU_ONLY=1
 
 script:
   - make --keep-going --jobs=$NUM_THREADS all test warn lint
-  - make runtestnogpu
+  - make runtest
   - make --jobs=$NUM_THREADS all
   - make --jobs=$NUM_THREADS test
   - make --jobs=$NUM_THREADS warn
diff --git a/Makefile b/Makefile
index 417ff86..109894d 100644
--- a/Makefile
+++ b/Makefile
@@ -294,7 +294,7 @@ SUPERCLEAN_EXTS := .so .a .o .bin .testbin .pb.cc .pb.h _pb2.py .cuo
 # Define build targets
 ##############################
 .PHONY: all test clean linecount lint tools examples $(DIST_ALIASES) \
-	py mat py$(PROJECT) mat$(PROJECT) proto runtest runtestnogpu \
+	py mat py$(PROJECT) mat$(PROJECT) proto runtest \
 	superclean supercleanlist supercleanfiles warn
 
 all: $(NAME) $(STATIC_NAME) tools examples
@@ -356,9 +356,6 @@ $(MAT$(PROJECT)_SO): $(MAT$(PROJECT)_SRC) $(STATIC_NAME)
 runtest: $(TEST_ALL_BIN)
 	$(TEST_ALL_BIN) $(TEST_GPUID) --gtest_shuffle $(TEST_FILTER)
 
-runtestnogpu: $(TEST_ALL_BIN)
-	$(TEST_ALL_BIN) --gtest_shuffle --gtest_filter="-*GPU*:*/2.*:*/3.*"
-
 warn: $(EMPTY_WARN_REPORT)
 
 $(EMPTY_WARN_REPORT): $(ALL_WARNS) | $(BUILD_DIR)
-- 
2.7.4