Run benchmarks on test inputs for CI build

plasma-umass · Aug 18, 2019 · baf5353 · baf5353
1 parent 3e2f144
commit baf5353
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,3 +27,4 @@ install:
 # Run the make check target (add tests later)
 script:
   - make check USE_SYSTEM_COZ=1
+  - cd benchmarks && make test USE_SYSTEM_COZ=1
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 ROOT := .
-DIRS := libcoz viewer
+DIRS := libcoz viewer benchmarks
 
 include $(ROOT)/common.mk
 
@@ -13,6 +13,3 @@ install:: all
 	@$(INSTALL) -D libcoz/libcoz.so $(DESTDIR)$(pkglibdir)/libcoz.so
 	@$(INSTALL) -D include/coz.h $(DESTDIR)$(incdir)/coz.h
 	@$(RST2MAN) docs/coz.rst $(DESTDIR)$(man1dir)/coz.1
-
-bench:: all
-	@$(MAKE) -C benchmarks bench
diff --git a/common.mk b/common.mk
@@ -50,8 +50,12 @@ LOG_SUFFIX := "$(shell tput sgr0)"
 # Build in parallel
 MAKEFLAGS += -j
 
-# Build all targets by default
+# Build all targets by default, unless this is a benchmark
+ifeq ($(BENCHMARK),)
 all:: $(TARGETS)
+else
+all::
+endif
 
 # Clean up after a bild
 clean::